summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-05 23:22:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-06 01:09:04 +0200
commitb5ef6f8eb452c37b19d973d61548725d7b91113e (patch)
treebc4050cdbe4712640761d65db27854a72f2181b5 /ffmpeg.c
parent0c72180ea660e2d1de71d8d03445e014d48b7e52 (diff)
Fix crash in ffmpeg.c with PIX_FMT_NONE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index cb23581ca4..e2692de5e2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -657,6 +657,7 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
break;
}
if (*p == -1) {
+ if(st->codec->pix_fmt != PIX_FMT_NONE)
av_log(NULL, AV_LOG_WARNING,
"Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
av_pix_fmt_descriptors[st->codec->pix_fmt].name,