aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/adpcm.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-04 17:33:44 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-04 17:33:44 +0100
commita5115752cad0fdda77ce07ecb0cbc05988a7f7c7 (patch)
treed85214c5887f570874fa229835584896539f7960 /libavcodec/adpcm.h
parentcb297f6ae79bf9e31e9981122c4161effdd9b8a1 (diff)
parentcd9b0bb07a66d3299bd62922e9dfa742219abe79 (diff)
downloadffmpeg-a5115752cad0fdda77ce07ecb0cbc05988a7f7c7.tar.gz
Merge commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79' into release/0.10
* commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79': 4xm: validate the buffer size before parsing it indeo: Do not reference mismatched tiles indeo: Sanitize ff_ivi_init_planes fail paths Conflicts: libavcodec/4xm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.h')
0 files changed, 0 insertions, 0 deletions