diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 14:51:02 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 14:51:02 +0200 |
commit | 6c18775bae785353dbe25508cab127629f9910a7 (patch) | |
tree | 5d9613d1465d97804635c116ed5f2759e6246cb6 /libavformat/ffmetadec.c | |
parent | 09b09ef4ab5c20feb815cb6ef7a297b8c046f44e (diff) | |
parent | 83c285f88016b087c2f0f4b9ef356ad8ef12d947 (diff) | |
download | ffmpeg-6c18775bae785353dbe25508cab127629f9910a7.tar.gz |
Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'
* commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947':
wtv: Add more sanity checks for a length read from the file
Conflicts:
libavformat/wtv.c
See: c42efad3c34cace09555e05fd0cb81cb59cc726f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmetadec.c')
0 files changed, 0 insertions, 0 deletions