diff options
author | Peter Ross <pross@xvid.org> | 2014-04-18 14:49:40 +1000 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-04-19 13:34:28 +0200 |
commit | 7269ab10c5179baa6928164b1bb932a62398d365 (patch) | |
tree | 66c58891df546287768c6a45f892cc67c8e01e1f /libswscale/swscale_unscaled.c | |
parent | caeed48982a17e1cbf5857eb69b1cb3b2a64a6e2 (diff) | |
download | ffmpeg-7269ab10c5179baa6928164b1bb932a62398d365.tar.gz |
ff_id3v2_read: add option to limit ID3 magic number search
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.
[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
Fixes ticket #3530.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5331773cc33ba26b9e26ace643d926219e46a17b)
Conflicts:
libavformat/dsfdec.c
libavformat/id3v2.c
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions