summaryrefslogtreecommitdiff
path: root/libavcodec/dv.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-07-26 22:28:26 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-07-26 22:34:44 +0200
commit7cbb856efe6ccab7485bb96ad3887472a6519ffa (patch)
tree7dd3b90c353c47412ef6d9f302d846ba2dffb238 /libavcodec/dv.c
parent788d8399385361a88e5d7bd4377cf38fb1488544 (diff)
Remove useless NULL check.
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 <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/dv.c')
-rw-r--r--libavcodec/dv.c2
1 files changed, 1 insertions, 1 deletions
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];
}