[FFmpeg-cvslog] Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
Michael Niedermayer
git at videolan.org
Wed May 15 10:01:36 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 15 09:57:28 2013 +0200| [cb22692f05f916ba521a88e198fa8d15f92c9303] | committer: Michael Niedermayer
Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5'
* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
vc1: implement frame interlaced b-frame header parsing
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb22692f05f916ba521a88e198fa8d15f92c9303
---
More information about the ffmpeg-cvslog
mailing list