From 2c28e26913df927e71d87fa851c9d950f281523b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 20 Nov 2011 19:56:49 +0100 Subject: [PATCH] ffplay: Check for pix_fmt changes Fixes Ticket238 by not crashing but also not playing the file. Signed-off-by: Michael Niedermayer Signed-off-by: Marton Balint --- ffplay.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index 46cf6a12d8..673f31db15 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1562,7 +1562,10 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width(); w += edge << 1; h += edge << 1; - + if (codec->pix_fmt != ctx->outputs[0]->format) { + av_log(codec, AV_LOG_ERROR, "Pixel format mismatches %d %d\n", codec->pix_fmt, ctx->outputs[0]->format); + return -1; + } if(!(ref = avfilter_get_video_buffer(ctx->outputs[0], perms, w, h))) return -1;