[FFmpeg-cvslog] avcodec/dvdec: remove redundant null check
Michael Niedermayer
git at videolan.org
Wed Jul 2 16:38:51 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 2 16:18:07 2014 +0200| [5307fa00a45b50897af3d5070e936fcaa82ae19e] | committer: Michael Niedermayer
avcodec/dvdec: remove redundant null check
Fixes CID700682 again
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5307fa00a45b50897af3d5070e936fcaa82ae19e
---
libavcodec/dvdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index fd61320..96534b6 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -380,7 +380,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);
ff_set_sar(avctx, s->sys->sar[is16_9]);
}
More information about the ffmpeg-cvslog
mailing list