[FFmpeg-cvslog] Merge remote branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Wed Apr 6 03:04:08 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 6 02:59:49 2011 +0200| [11d78415ca1beaa39303c280d7896024edc45aa7] | committer: Michael Niedermayer
Merge remote branch 'qatar/master'
* qatar/master:
psymodel: extend API to include PE and bit allocation.
avio: always compile dyn_buf functions
Remove unnecessary parameter from ff_thread_init() and fix behavior
Revert "aac_latm_dec: use aac context and aac m4ac"
configure: tell user if libva is enabled like the rest of external libs.
Add silence support for AV_SAMPLE_FMT_U8.
avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
avio: deprecate av_url_read_seek
avio: deprecate av_url_read_pause
ac3enc: NEON optimised extract_exponents
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11d78415ca1beaa39303c280d7896024edc45aa7
---
More information about the ffmpeg-cvslog
mailing list