Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'

* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
  dv: Drop a spurious check

Conflicts:
	libavcodec/dvdec.c

See: 5307fa00a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/dvdec.c

@@ -505,7 +505,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data,
     if (*vsc_pack == dv_video_control) {
         apt    = buf[4] & 0x07;
         is16_9 = (vsc_pack[2] & 0x07) == 0x02 ||
-                               (!apt && (vsc_pack[2] & 0x07) == 0x07);
+                 (!apt && (vsc_pack[2] & 0x07) == 0x07);
         ff_set_sar(avctx, s->sys->sar[is16_9]);
     }