From 201412ffec044bb064734edb699e91152f7b53b2 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 24 Apr 2013 14:59:49 +0200
Subject: [PATCH] vc1dec: Factorize picture pointer selection in
vc1_mc_4mv_chroma()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavcodec/vc1dec.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b13e91f9243..f56f074a53c 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -829,14 +829,9 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
}
if (!dir) {
- if (v->field_mode) {
- if ((v->cur_field_type != chroma_ref_type) && v->cur_field_type) {
- srcU = s->current_picture.f.data[1];
- srcV = s->current_picture.f.data[2];
- } else {
- srcU = s->last_picture.f.data[1];
- srcV = s->last_picture.f.data[2];
- }
+ if (v->field_mode && (v->cur_field_type != chroma_ref_type) && v->cur_field_type) {
+ srcU = s->current_picture.f.data[1];
+ srcV = s->current_picture.f.data[2];
} else {
srcU = s->last_picture.f.data[1];
srcV = s->last_picture.f.data[2];
--
GitLab