Michael Niedermayer 58f63670e1 Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25' ...

* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25':
  mpegvideo: Move ER functions to a separate file

Conflicts:
	libavcodec/mpegvideo.c

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

2015-06-12 20:47:14 +02:00

961 B

Raw Blame History

View Raw