[FFmpeg-cvslog] Merge commit 'ce0972ecddef3eee3c03e393108e5728821e3e37' into release/2.4
Michael Niedermayer
git at videolan.org
Sat Oct 4 23:20:21 CEST 2014
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 4 23:14:07 2014 +0200| [6101187c5501c302350d01f50d5aa7f76a6b4ce5] | committer: Michael Niedermayer
Merge commit 'ce0972ecddef3eee3c03e393108e5728821e3e37' into release/2.4
* commit 'ce0972ecddef3eee3c03e393108e5728821e3e37':
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=6101187c5501c302350d01f50d5aa7f76a6b4ce5
---
More information about the ffmpeg-cvslog
mailing list