summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-20 02:15:13 +0200
committerMartin Storsjö <martin@martin.st>2013-05-15 11:39:17 +0300
commit012b319d9147c18e6148003052b147722d11fe6e (patch)
tree74212a53c74261da2cf41acd5bf0f434e914577d
parent0313653928b47c3b0e493c08c66bb1a374695f7c (diff)
downloadffmpeg-streaming-012b319d9147c18e6148003052b147722d11fe6e.zip
ffmpeg-streaming-012b319d9147c18e6148003052b147722d11fe6e.tar.gz
vc1dec: Fix tff == 0 handling in init_block_index()
This fixes several files from VLC ticket 5887. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 1238da2..b07214a 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -77,7 +77,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];
OpenPOWER on IntegriCloud