[FFmpeg-cvslog] Merge commit 'e5419709f50593769037ab77d7102f82d9260784'
Michael Niedermayer
git at videolan.org
Mon Dec 9 14:34:24 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 9 13:31:23 2013 +0100| [cefabaad3e882004ca7a54ea39500ee8e1c6ea93] | committer: Michael Niedermayer
Merge commit 'e5419709f50593769037ab77d7102f82d9260784'
* commit 'e5419709f50593769037ab77d7102f82d9260784':
lavc: remove the extended_data workarounds.
Conflicts:
libavcodec/utils.c
One hunk is not merged as not all codecs are updated yet
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cefabaad3e882004ca7a54ea39500ee8e1c6ea93
---
More information about the ffmpeg-cvslog
mailing list