ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Sep 27
03:38:12 2014 +0200| [be5dd8aa5558cabe256c78de0ec8063f5810b96f] | committer:
Michael Niedermayer
Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'
* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
mpeg12: Always invoke the get_format() callback
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be5dd8aa5558cabe256c78de0ec8063f5810b96f
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
