MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

img2enc: check pix_fmt for split planes mode.

Browse Source 
Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-06 01:25:59 +01:00
parent 6dfcc7abdd
commit 67ee2d2f6d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/img2enc.c
View File

@ -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;
}