diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2012-10-26 22:55:04 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-01-02 20:34:08 +0100 |
| commit | abe345251a1c7d56a8afc140d8002f4fe2d2a42b (patch) | |
| tree | 321c771f0aca6afe9d7151cc1207eedec0ac3372 | |
| parent | 9837f196938427be3aa35a3768e5836354ff51d4 (diff) | |
| download | ffmpeg-abe345251a1c7d56a8afc140d8002f4fe2d2a42b.tar.gz | |
yuv4mpeg: reject unsupported codecs
The muxer already rejects unsupported pixel formats, reject also
unsupported codecs to prevent dangerous misuses.
(cherry picked from commit 424b1e764263b1493de4c34365ef367ddae856db)
Conflicts:
libavformat/yuv4mpeg.c
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavformat/yuv4mpeg.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 09aabedea9..f68c1a708f 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -155,6 +155,11 @@ static int yuv4_write_header(AVFormatContext *s) if (s->nb_streams != 1) return AVERROR(EIO); + if (s->streams[0]->codec->codec_id != CODEC_ID_RAWVIDEO) { + av_log(s, AV_LOG_ERROR, "ERROR: Only rawvideo supported.\n"); + return AVERROR_INVALIDDATA; + } + if (s->streams[0]->codec->pix_fmt == PIX_FMT_YUV411P) { av_log(s, AV_LOG_ERROR, "Warning: generating rarely used 4:1:1 YUV " "stream, some mjpegtools might not work.\n"); |