summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-24 15:01:08 +0200
committerMartin Storsjö <martin@martin.st>2013-05-15 11:40:38 +0300
commitccb148e4780e63f71967272b746e02bf5a24da66 (patch)
treef5ab2dbc5d920a82d69e894283be834f6cd96162 /libavcodec/vc1dec.c
parent201412ffec044bb064734edb699e91152f7b53b2 (diff)
vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma()
No sample tried shows a difference. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r--libavcodec/vc1dec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index f56f074a53..a3b6031752 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -380,7 +380,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
uvmy = uvmy + ((uvmy < 0) ? (uvmy & 1) : -(uvmy & 1));
}
if (!dir) {
- if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->cur_field_type) {
+ if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->second_field) {
srcY = s->current_picture.f.data[0];
srcU = s->current_picture.f.data[1];
srcV = s->current_picture.f.data[2];
@@ -554,7 +554,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir)
my = s->mv[dir][n][1];
if (!dir) {
- if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->cur_field_type) {
+ if (v->field_mode && (v->cur_field_type != v->ref_field_type[dir]) && v->second_field) {
srcY = s->current_picture.f.data[0];
} else
srcY = s->last_picture.f.data[0];
@@ -829,7 +829,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
}
if (!dir) {
- if (v->field_mode && (v->cur_field_type != chroma_ref_type) && v->cur_field_type) {
+ if (v->field_mode && (v->cur_field_type != chroma_ref_type) && v->second_field) {
srcU = s->current_picture.f.data[1];
srcV = s->current_picture.f.data[2];
} else {