Michael Niedermayer fecebb7aba Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7' ...

* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
  mpeg: K&R formatting cosmetics

Conflicts:
	libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-24 05:28:07 +01:00

32 KiB

Raw Blame History

View Raw