aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/tree.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-20 18:20:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-20 18:31:45 +0200
commit7c6c4cf2fb48d7469170e1fc5d9096b95e9b7e9f (patch)
treeebcb01edc8a350bbd4315c38a98a31a1e1694f64 /libavutil/tree.c
parent045ef52ef513973a134f95c10a33f9ccb89ec92f (diff)
parent7b4ee3a21d7c7419b485bf7af3b2795b9c3e89ea (diff)
downloadffmpeg-7c6c4cf2fb48d7469170e1fc5d9096b95e9b7e9f.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Remove h264_lowres_idct_put/add functions Remove snow/dwt test program h264: remove some disabled code Fix incorrect max_lowres values matroskadec: fix integer underflow if header length < probe length. cosmetics: indentation eac3enc: use frame exponent strategy when applicable. cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder. dsputil: fix ff_check_alignment() Conflicts: libavcodec/Makefile libavcodec/h264idct_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/tree.c')
0 files changed, 0 insertions, 0 deletions