aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/cutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-30 14:04:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-30 14:11:38 +0200
commitafddf0d9105d2e4f7e6abfab2613fd7ba5747daf (patch)
treea7a1c9d3e24db46f47369fec2f480dab4132a290 /libavformat/cutils.c
parente3fb8ac9564b6a3d86c5f60c940f2056a4faae56 (diff)
parent6765ee7b9cba46818a45b051438b2552f0a1b70a (diff)
downloadffmpeg-afddf0d9105d2e4f7e6abfab2613fd7ba5747daf.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mjpeg: Check the unescaped size for overflows Conflicts: libavcodec/mjpegdec.c See: a9456c7c5ca883b5a3947e59a9fba5587e18e119 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cutils.c')
0 files changed, 0 insertions, 0 deletions