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

Merge commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c'

Browse Source 
* commit '955aec3c7c7be39b659197e1ec379a09f2b7c41c':
  mpegaudiodecheader: check the header in avpriv_mpegaudio_decode_header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2016-01-01 16:47:27 +01:00
parent 15c60c8af2 955aec3c7c
commit 1e96b151fa
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mp3dec.c
View File

@@ -82,9 +82,6 @@ static int mp3_read_probe(AVProbeData *p)
for(; buf < end; buf= buf2+1) {
buf2 = buf;
if(ff_mpa_check_header(AV_RB32(buf2)))
continue;
for(frames = 0; buf2 < end; frames++) {
int dummy;
header = AV_RB32(buf2);
@@ -302,14 +299,16 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
MPADecodeHeader c;
int vbrtag_size = 0;
MP3DecContext *mp3 = s->priv_data;
int ret;
ffio_init_checksum(s->pb, ff_crcA001_update, 0);
v = avio_rb32(s->pb);
if(ff_mpa_check_header(v) < 0)
return -1;
if (avpriv_mpegaudio_decode_header(&c, v) == 0)
ret = avpriv_mpegaudio_decode_header(&c, v);
if (ret < 0)
return ret;
else if (ret == 0)
vbrtag_size = c.frame_size;
if(c.layer != 3)
return -1;