summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-20 02:15:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-20 02:22:32 +0200
commit6c9d28a2294de86519c7c613c76394c66dcfd83c (patch)
tree2330511480711905d209c119709aee320ffdc693 /libavcodec/vc1dec.c
parenta0fbc28c3881fb932597e0776780b09e8a1347f5 (diff)
vc1dec: Fix tff == 0 handling in init_block_index()
This fixes several files from VLC ticket5887 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 6451f0cf57..08bbb88ba5 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -78,7 +78,7 @@ static void init_block_index(VC1Context *v)
{
MpegEncContext *s = &v->s;
ff_init_block_index(s);
- if (v->field_mode && v->second_field) {
+ if (v->field_mode && !(v->second_field ^ v->tff)) {
s->dest[0] += s->current_picture_ptr->f.linesize[0];
s->dest[1] += s->current_picture_ptr->f.linesize[1];
s->dest[2] += s->current_picture_ptr->f.linesize[2];