aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-11-12 19:10:39 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-11-15 12:49:37 +0100
commit74d7db586a2e9aeb107e357739c7e4dde0b6991c (patch)
tree67791902ec77b51b6566735b247e6e5cbecbe1f9
parent8562c1483ba647f562e4c1df68a9231274b80e6b (diff)
downloadffmpeg-74d7db586a2e9aeb107e357739c7e4dde0b6991c.tar.gz
dv: Drop a spurious check
The buffer is always valid. Bug-Id: CID 700682
-rw-r--r--libavcodec/dvdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index a1235d383c..bdf3eea391 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -383,8 +383,8 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data,
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);
ff_set_sar(avctx, s->sys->sar[is16_9]);
}