Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-15 21:09:30 +0300
committerMichael Niedermayer <michaelni@gmx.at>2014-11-15 21:11:14 +0300
commit89e705cd5c94e6ccaa2969720de2f238c42c7e3c (patch)
tree1112d32aa039a1d86b5eb358c37d832751da1a84 /libavcodec/dvdec.c
parenta2f05d33373eb56a87f9581b33d50e44bb5f6a0b (diff)
parent74d7db586a2e9aeb107e357739c7e4dde0b6991c (diff)
Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'
* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c': dv: Drop a spurious check Conflicts: libavcodec/dvdec.c See: 5307fa00a45b50897af3d5070e936fcaa82ae19e Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdec.c')
-rw-r--r--libavcodec/dvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 4f0d0f64c9..99fe1f4981 100644
--- a/libavcodec/dvdec.c
+++ b/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]);
}