aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dct32_float.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-07 13:13:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-07 13:13:12 +0200
commit6bfa823b70ec135b59e036106eb403a546145faa (patch)
tree4cd3e330b770111dce9d0906856304b09da095a9 /libavcodec/dct32_float.c
parent701543a081e039a7ee1afd2286f4ccefabb195cc (diff)
parent8dc4b2c92e492aa172327d10c926d5ca3a04371c (diff)
downloadffmpeg-6bfa823b70ec135b59e036106eb403a546145faa.tar.gz
Merge commit '8dc4b2c92e492aa172327d10c926d5ca3a04371c' into release/1.1
* commit '8dc4b2c92e492aa172327d10c926d5ca3a04371c': pictordec: break out of both decoding loops when y drops below 0 vcr1: add sanity checks Conflicts: libavcodec/pictordec.c libavcodec/vcr1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct32_float.c')
0 files changed, 0 insertions, 0 deletions