From 7cbb856efe6ccab7485bb96ad3887472a6519ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Tue, 26 Jul 2011 22:28:26 +0200 Subject: Remove useless NULL check. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We dereferenced the pointer two lines above, no point in checking for NULL afterwards. In addition it cannot be NULL the way it was initialized just one line further above. Signed-off-by: Reimar Döffinger --- libavcodec/dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/dv.c b/libavcodec/dv.c index bfd5ae4413..bd9290a768 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -1109,7 +1109,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, vsc_pack = buf + 80*5 + 48 + 5; if ( *vsc_pack == dv_video_control ) { apt = buf[4] & 0x07; - is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 || (!apt && (vsc_pack[2] & 0x07) == 0x07))); + is16_9 = (vsc_pack[2] & 0x07) == 0x02 || (!apt && (vsc_pack[2] & 0x07) == 0x07); avctx->sample_aspect_ratio = s->sys->sar[is16_9]; } -- cgit v1.2.3