virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Code Issues Releases Activity

avformat/ffmdec: Check media type for chunks

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-12-03 13:39:56 +01:00
parent 591c032421
commit e706e2e775
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/ffmdec.c
+4 -4
View File
@@ -381,7 +381,7 @@ static int ffm2_read_header(AVFormatContext *s)
} }
break; break;
case MKBETAG('S', 'T', 'V', 'I'): case MKBETAG('S', 'T', 'V', 'I'):
if (f_stvi++) { if (f_stvi++ || codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
@@ -445,7 +445,7 @@ static int ffm2_read_header(AVFormatContext *s)
avio_rb32(pb); // refs avio_rb32(pb); // refs
break; break;
case MKBETAG('S', 'T', 'A', 'U'): case MKBETAG('S', 'T', 'A', 'U'):
if (f_stau++) { if (f_stau++ || codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
@@ -474,7 +474,7 @@ static int ffm2_read_header(AVFormatContext *s)
} }
break; break;
case MKBETAG('S', '2', 'V', 'I'): case MKBETAG('S', '2', 'V', 'I'):
if (f_stvi++ || !size) { if (f_stvi++ || !size || codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
@@ -492,7 +492,7 @@ static int ffm2_read_header(AVFormatContext *s)
goto fail; goto fail;
break; break;
case MKBETAG('S', '2', 'A', 'U'): case MKBETAG('S', '2', 'A', 'U'):
if (f_stau++ || !size) { if (f_stau++ || !size || codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }