diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-07-01 00:37:08 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-09-06 16:26:57 -0300 |
| commit | 60094fc2f552aace794395648110408a6eb825ad (patch) | |
| tree | 55551710b60041291ae8543e0beeac63aadf2bb8 /libavformat | |
| parent | 02537719538b71cb2b51fdb4a59c99fd9dbd2d09 (diff) | |
| download | ffmpeg-60094fc2f552aace794395648110408a6eb825ad.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.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 993d232b70..32704f9bfd 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; } |