aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2019-07-01 00:37:08 +0200
committerJames Almer <jamrial@gmail.com>2019-09-06 18:59:23 -0300
commit4a79f30d774dd81bde2da751fbd588e3413da2d7 (patch)
treeb7912b6deaf6490cc0b9dadc0a653430fd88a464 /libavformat
parent1687b067dd5879034388a6c03f79619586918b7e (diff)
downloadffmpeg-4a79f30d774dd81bde2da751fbd588e3413da2d7.tar.gz
lavf/rawenc: Only accept the appropriate stream type for raw muxers.
This does not affect the rawvideo muxer. Fixes ticket #7979. (cherry picked from commit aef24efb0c1e65097ab77a4bf9264189bdf3ace3)
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rawenc.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 809ca23b1a..6e5d175483 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -39,6 +39,18 @@ static int force_one_stream(AVFormatContext *s)
s->oformat->name);
return AVERROR(EINVAL);
}
+ if ( s->oformat->audio_codec != AV_CODEC_ID_NONE
+ && s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+ av_log(s, AV_LOG_ERROR, "%s files have exactly one audio stream\n",
+ s->oformat->name);
+ return AVERROR(EINVAL);
+ }
+ if ( s->oformat->video_codec != AV_CODEC_ID_NONE
+ && s->streams[0]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) {
+ av_log(s, AV_LOG_ERROR, "%s files have exactly one video stream\n",
+ s->oformat->name);
+ return AVERROR(EINVAL);
+ }
return 0;
}