[FFmpeg-cvslog] ffplay: Check for pix_fmt changes Fixes Ticket238 by not crashing but also not playing the file .

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 20 19:56:49 2011 +0100| [2c28e26913df927e71d87fa851c9d950f281523b] | committer: Marton Balint

ffplay: Check for pix_fmt changes Fixes Ticket238 by not crashing but also not playing the file.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Marton Balint <cus at passwd.hu>

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

 ffplay.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 46cf6a1..673f31d 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;