summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-24 14:59:49 +0200
committerMartin Storsjö <martin@martin.st>2013-05-15 11:40:17 +0300
commit201412ffec044bb064734edb699e91152f7b53b2 (patch)
treee91d399a3fc1bf63c2da6b3ff8db649594c3ec13 /libavcodec/vc1dec.c
parent2412ad171716edc57905f9473123a59ebce2ed63 (diff)
vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r--libavcodec/vc1dec.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b13e91f924..f56f074a53 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];