diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-02 16:18:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-02 16:37:38 +0200 |
| commit | 5307fa00a45b50897af3d5070e936fcaa82ae19e (patch) | |
| tree | 3403766743d95e19339c4e04eb441201593d03f7 /libavcodec/dvdec.c | |
| parent | d266ecff4b6053a60d3bbdd209043facdf469b28 (diff) | |
| download | ffmpeg-5307fa00a45b50897af3d5070e936fcaa82ae19e.tar.gz | |
avcodec/dvdec: remove redundant null check
Fixes CID700682 again
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdec.c')
| -rw-r--r-- | libavcodec/dvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index fd61320f8e..96534b624b 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]); } |