[FFmpeg-cvslog] Merge commit '0989a120f1dec400c54fcb54670cb84bba36d99b' into release/2.2

Michael Niedermayer git at videolan.org
Sat Nov 1 15:40:01 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  1 15:25:42 2014 +0100| [0f4c03cd634031181479ca94874e1b80b5638417] | committer: Michael Niedermayer

Merge commit '0989a120f1dec400c54fcb54670cb84bba36d99b' into release/2.2

* commit '0989a120f1dec400c54fcb54670cb84bba36d99b':
  mpeg12: Always invoke the get_format() callback

Conflicts:
	libavcodec/mpeg12dec.c

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

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





More information about the ffmpeg-cvslog mailing list