diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 13:41:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 13:41:27 +0200 |
| commit | dbddd587e13b9bf718ee0eb0d183be6d8ffb996f (patch) | |
| tree | a8e2f612fb31b20604f9fce298d1c8479a120a98 /libavformat/soxdec.c | |
| parent | f13f4d2b086519c2b0692ae1ff12d81e8ec494f1 (diff) | |
| parent | de2e5777e225e75813daf2373c95e223651fd89a (diff) | |
| download | ffmpeg-dbddd587e13b9bf718ee0eb0d183be6d8ffb996f.tar.gz | |
Merge commit 'de2e5777e225e75813daf2373c95e223651fd89a'
* commit 'de2e5777e225e75813daf2373c95e223651fd89a':
4xm: validate the buffer size before parsing it
Conflicts:
libavcodec/4xm.c
See: 9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/soxdec.c')
0 files changed, 0 insertions, 0 deletions