From 6cc2ad4744c32897d195ad1e818317c13bb065f7 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Tue, 24 Jul 2012 15:55:12 +0200 Subject: [PATCH] avidemux: rearrange some checks to avoid NULL use --- gst/avi/gstavidemux.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 24f6bcd..c7016f4 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -4468,6 +4468,11 @@ gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf) if (stream->strh->type != GST_RIFF_FCC_vids) return buf; + if (stream->strf.vids == NULL) { + GST_WARNING ("Failed to retrieve vids for stream"); + return buf; + } + fourcc = (stream->strf.vids->compression) ? stream->strf.vids->compression : stream->strh->fcc_handler; if (!gst_avi_demux_is_uncompressed (fourcc)) { @@ -4483,11 +4488,6 @@ gst_avi_demux_invert (GstAviStream * stream, GstBuffer * buf) return buf; } - if (stream->strf.vids == NULL) { - GST_WARNING ("Failed to retrieve vids for stream"); - return buf; - } - h = stream->strf.vids->height; w = stream->strf.vids->width; stride = GST_ROUND_UP_4 (w * (bpp / 8)); -- 2.7.4