Commit c163e62d authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/ivi: Factor ref_mb check out

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 468ae6a7
...@@ -806,10 +806,11 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, ...@@ -806,10 +806,11 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
mb->mv_y = 0; mb->mv_y = 0;
} }
if (band->inherit_qdelta && ref_mb) if (ref_mb) {
if (band->inherit_qdelta)
mb->q_delta = ref_mb->q_delta; mb->q_delta = ref_mb->q_delta;
if (band->inherit_mv && ref_mb) { if (band->inherit_mv) {
/* motion vector inheritance */ /* motion vector inheritance */
if (mv_scale) { if (mv_scale) {
mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale); mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale);
...@@ -836,10 +837,10 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, ...@@ -836,10 +837,10 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
} }
} }
} }
ref_mb++;
}
mb++; mb++;
if (ref_mb)
ref_mb++;
mb_offset += band->mb_size; mb_offset += band->mb_size;
} // for x } // for x
offs += row_offset; offs += row_offset;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment