[FFmpeg-devel] [PATCH] ffprobe: only decode frame if the codec is available

Stefano Sabatini stefasab at gmail.com
Sun Jul 15 15:58:06 CEST 2012


Fix crash when a stream codec is unknown, in particular fix trac
ticket #1243.
---
 ffprobe.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index 1f6e048..7113651 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;
 }
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list