[FFmpeg-cvslog] Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'

Michael Niedermayer git at videolan.org
Fri Jun 12 20:53:55 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 12 20:47:14 2015 +0200| [58f63670e173c1113ab231850572be303a21faef] | committer: Michael Niedermayer

Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'

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

Conflicts:
	libavcodec/mpegvideo.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58f63670e173c1113ab231850572be303a21faef
---





More information about the ffmpeg-cvslog mailing list