[FFmpeg-cvslog] ffprobe: Don't try and decode things that have no dec_ctx

Derek Buitenhuis git at videolan.org
Tue Apr 12 18:24:44 CEST 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Apr 12 17:23:38 2016 +0100| [e8373143e11827b668495ff3323c3abedb3dc9da] | committer: Derek Buitenhuis

ffprobe: Don't try and decode things that have no dec_ctx

The last instance of a missing dec_ctx check from the merge.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 ffprobe.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffprobe.c b/ffprobe.c
index 7dc8100..a7e329c 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1956,7 +1956,7 @@ static av_always_inline int process_frame(WriterContext *w,
     AVSubtitle sub;
     int ret = 0, got_frame = 0;
 
-    if (dec_ctx->codec) {
+    if (dec_ctx && dec_ctx->codec) {
         switch (par->codec_type) {
         case AVMEDIA_TYPE_VIDEO:
             ret = avcodec_decode_video2(dec_ctx, frame, &got_frame, pkt);



More information about the ffmpeg-cvslog mailing list