[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Dec 10 04:51:03 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 10 02:13:26 2012 +0100| [529d3e002642a9901ae463dea0263768dc843173] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: remove unused macro WRAPPER8_16
configure: fix automatic processing of _extralibs in check_deps
libvpxenc: Support forcing keyframes
ac3dec: decode directly into output buffers
Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=529d3e002642a9901ae463dea0263768dc843173
---
More information about the ffmpeg-cvslog
mailing list