aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/framehash.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-14 12:42:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-14 12:43:45 +0200
commit8c0bb195220d9dc7b46701519cc1a617ddbba0b8 (patch)
tree38efa3ea89983b3707eeb85047ea5d4afab9a45a /libavformat/framehash.c
parent54623619373d316136d184153d0d7387acef6426 (diff)
parent6255ccf7d51c82ab79bf0cd47a921f572dda4489 (diff)
downloadffmpeg-8c0bb195220d9dc7b46701519cc1a617ddbba0b8.tar.gz
Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'
* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489': indeo4: Check the quantization matrix index Conflicts: libavcodec/indeo4.c See: 8a20774a24bb1ea68b7360113746eac6e59ad8a8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/framehash.c')
0 files changed, 0 insertions, 0 deletions