[FFmpeg-cvslog] yuv4mpeg: complain and exit if a non-rawvideo stream is selected

Stefano Sabatini git at videolan.org
Wed Jun 1 13:29:31 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Mon May 30 17:09:12 2011 +0200| [1f95fb58137951941d8d74bd47b1635b6d2399ec] | committer: Stefano Sabatini

yuv4mpeg: complain and exit if a non-rawvideo stream is selected

The yuv4mpeg muxer will crash otherwise.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f95fb58137951941d8d74bd47b1635b6d2399ec
---

 libavformat/yuv4mpeg.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 445ec37..90b222d 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -154,6 +154,12 @@ 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,
+               "A non-rawvideo stream was selected, but yuv4mpeg only handles rawvideo streams\n");
+        return AVERROR(EINVAL);
+    }
+
     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");
     }



More information about the ffmpeg-cvslog mailing list