[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed Sep 5 15:06:33 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 5 15:02:17 2012 +0200| [b21b5b04cca0633bd88db972ff1187ab7825b667] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: eamad: Add missing dependency on mpegvideo code
build: utvideoenc: Add missing dependency on Huffman code
avopt: Reorder the default_val struct, making i64 the first field
Conflicts:
configure
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b21b5b04cca0633bd88db972ff1187ab7825b667
---
More information about the ffmpeg-cvslog
mailing list