[FFmpeg-cvslog] vc1dec: Fix tff == 0 handling in init_block_index()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 02:15:13 2013 +0200| [6c9d28a2294de86519c7c613c76394c66dcfd83c] | committer: Michael Niedermayer

vc1dec: Fix tff == 0 handling in init_block_index()

This fixes several files from VLC ticket5887

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c9d28a2294de86519c7c613c76394c66dcfd83c
---

 libavcodec/vc1dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 6451f0c..08bbb88 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];