aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/j2k_dwt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-14 14:12:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-14 14:12:14 +0100
commitacada70ffbd729516495ee683f70abad124f93d5 (patch)
tree3c4626e79bca9730658665863ec93e038a8ad93e /libavcodec/j2k_dwt.c
parent4f91c45644931064901986bca70a8903c7956564 (diff)
parentdb5b454c3d20f0e2e7fff8f0091e776ae9757725 (diff)
downloadffmpeg-acada70ffbd729516495ee683f70abad124f93d5.tar.gz
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7: Update changelog for 0.7.7 release mpeg12: do not decode extradata more than once. indeo4/5: check empty tile size in decode_mb_info(). dfa: improve boundary checks in decode_dds1() indeo5dec: Make sure we have had a valid gop header. rv34: error out on size changes with frame threading Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k_dwt.c')
0 files changed, 0 insertions, 0 deletions