From 5626e812d2c1c202f749824905b70cdb8a845e7b Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 15 Jul 2012 15:56:02 +0200 Subject: ffprobe: only decode frame if the codec is available Fix crash when a stream codec is unknown, in particular fix trac ticket #1243. --- ffprobe.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ffprobe.c') diff --git a/ffprobe.c b/ffprobe.c index 1f6e048245..71136516b9 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1661,6 +1661,7 @@ static av_always_inline int get_decoded_frame(AVFormatContext *fmt_ctx, int ret = 0; *got_frame = 0; + if (dec_ctx->codec) { switch (dec_ctx->codec_type) { case AVMEDIA_TYPE_VIDEO: ret = avcodec_decode_video2(dec_ctx, frame, got_frame, pkt); @@ -1670,6 +1671,7 @@ static av_always_inline int get_decoded_frame(AVFormatContext *fmt_ctx, ret = avcodec_decode_audio4(dec_ctx, frame, got_frame, pkt); break; } + } return ret; } -- cgit v1.2.3