From b276de78275b61481384b1edc532a7ebe69079f5 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 29 Jan 2016 23:28:59 +1100 Subject: [PATCH] amcvideodec: guard against not finding a valid frame in loop Fixes sporadic crashes on finishing decoding a video. https://bugzilla.gnome.org/show_bug.cgi?id=761014 --- sys/androidmedia/gstamcvideodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/androidmedia/gstamcvideodec.c b/sys/androidmedia/gstamcvideodec.c index 49808f9bf3..36b547a869 100644 --- a/sys/androidmedia/gstamcvideodec.c +++ b/sys/androidmedia/gstamcvideodec.c @@ -1300,7 +1300,7 @@ retry: "Frame is too late, dropping (deadline %" GST_STIME_FORMAT ")", GST_STIME_ARGS (deadline)); flow_ret = gst_video_decoder_drop_frame (GST_VIDEO_DECODER (self), frame); - } else if (self->codec_config == AMC_CODEC_CONFIG_WITH_SURFACE) { + } else if (frame && self->codec_config == AMC_CODEC_CONFIG_WITH_SURFACE) { GstBuffer *outbuf; GstGLSyncMeta *sync_meta; GstVideoCodecState *state;