summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-24 14:59:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-24 14:59:49 +0200
commit236b0c408426a26d9d757219f1435848babcbb9c (patch)
treed3d82d80385d8948d71f96d897ead90481e3e0fc
parent72e5d9190843b4da113477877d69a9f72f319410 (diff)
downloadffmpeg-streaming-236b0c408426a26d9d757219f1435848babcbb9c.zip
ffmpeg-streaming-236b0c408426a26d9d757219f1435848babcbb9c.tar.gz
vc1dec: factorize picture pointer selection in vc1_mc_4mv_chroma()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vc1dec.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index a21bdba..cec36c6 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -849,14 +849,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];
OpenPOWER on IntegriCloud