[FFmpeg-cvslog] img2enc: check pix_fmt for split planes mode.

Michael Niedermayer git at videolan.org
Tue Nov 6 01:32:34 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  6 01:25:59 2012 +0100| [67ee2d2f6d89b46b1ee045ce4ae8764086e620b6] | committer: Michael Niedermayer

img2enc: check pix_fmt for split planes mode.

Found-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/img2enc.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index c485569..0ab7c65 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -24,6 +24,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
@@ -42,6 +43,7 @@ static int write_header(AVFormatContext *s)
 {
     VideoMuxData *img = s->priv_data;
     AVStream *st = s->streams[0];
+    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(st->codec->pix_fmt);
     const char *str;
 
     av_strlcpy(img->path, s->filename, sizeof(img->path));
@@ -56,7 +58,10 @@ static int write_header(AVFormatContext *s)
     img->split_planes =     str
                          && !av_strcasecmp(str + 1, "y")
                          && s->nb_streams == 1
-                         && st->codec->codec_id == AV_CODEC_ID_RAWVIDEO;
+                         && st->codec->codec_id == AV_CODEC_ID_RAWVIDEO
+                         && desc
+                         &&(desc->flags & PIX_FMT_PLANAR)
+                         && desc->nb_components >= 3;
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list