aboutsummaryrefslogtreecommitdiffstats
path: root/doc/git-howto.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-06 02:59:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-06 02:59:49 +0200
commit11d78415ca1beaa39303c280d7896024edc45aa7 (patch)
treecea1da5ffc8ae3e09d7375241a1a334e27703610 /doc/git-howto.txt
parentee6db0de3760ceb7b7a9968a5322c1d8e8e23861 (diff)
parent5371803dd5d9f7bbc62d68274084d25f10a8dc61 (diff)
downloadffmpeg-11d78415ca1beaa39303c280d7896024edc45aa7.tar.gz
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@gmx.at>
Diffstat (limited to 'doc/git-howto.txt')
0 files changed, 0 insertions, 0 deletions