diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-20 22:56:49 +0400 |
---|---|---|
committer | Marton Balint <cus@passwd.hu> | 2011-11-21 23:20:48 +0400 |
commit | 2c28e26913df927e71d87fa851c9d950f281523b (patch) | |
tree | d1b3e1d485e3b711dd394a358fd9288d4b185a6f /ffplay.c | |
parent | 2f0f9a87d0e8d27ce6ad5b81134d01b9d2392cd1 (diff) |
ffplay: Check for pix_fmt changes Fixes Ticket238 by not crashing but also not playing the file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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; |