har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/apm: check codec tag in probe and add constant

Browse Source 
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Zane van Iperen 2020-06-12 11:46:15 +00:00 committed by Michael Niedermayer
parent 94bac7b3f8
commit a37109d555
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/apm.c
View File

@ -29,6 +29,7 @@
#define APM_VS12_CHUNK_SIZE 76 #define APM_VS12_CHUNK_SIZE 76
#define APM_MAX_READ_SIZE 4096 #define APM_MAX_READ_SIZE 4096
#define APM_TAG_CODEC 0x2000
#define APM_TAG_VS12 MKTAG('v', 's', '1', '2') #define APM_TAG_VS12 MKTAG('v', 's', '1', '2')
#define APM_TAG_DATA MKTAG('D', 'A', 'T', 'A') #define APM_TAG_DATA MKTAG('D', 'A', 'T', 'A')
@ -74,6 +75,9 @@ static void apm_parse_vs12(APMVS12Chunk *vs12, const uint8_t *buf)
static int apm_probe(const AVProbeData *p) static int apm_probe(const AVProbeData *p)
{ {
if (AV_RL16(p->buf) != APM_TAG_CODEC)
return 0;
if (p->buf_size < 100) if (p->buf_size < 100)
return 0; return 0;
@ -103,7 +107,7 @@ static int apm_read_header(AVFormatContext *s)
if (st->codecpar->bits_per_coded_sample != 4) if (st->codecpar->bits_per_coded_sample != 4)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (st->codecpar->codec_tag != 0x2000) if (st->codecpar->codec_tag != APM_TAG_CODEC)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
/* ff_get_wav_header() does most of the work, but we need to fix a few things. */ /* ff_get_wav_header() does most of the work, but we need to fix a few things. */