diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-24 22:52:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-31 23:23:52 +0200 |
| commit | 111e9b0929ab881f2735ca3036cb43b73ab4fe61 (patch) | |
| tree | 6c1dd0ac5e1b4122796017938e8cbdb4da0821d1 /libavcodec | |
| parent | c163e62db53dd80ee0f056def1720b3aca8bfe69 (diff) | |
| download | ffmpeg-111e9b0929ab881f2735ca3036cb43b73ab4fe61.tar.gz | |
avcodec/ivi: fix indention for previous commit
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ivi.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index 1a496d9b2d..79147a42cd 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -807,36 +807,36 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, } if (ref_mb) { - if (band->inherit_qdelta) - mb->q_delta = ref_mb->q_delta; - - if (band->inherit_mv) { - /* motion vector inheritance */ - if (mv_scale) { - mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale); - mb->mv_y = ivi_scale_mv(ref_mb->mv_y, mv_scale); - } else { - mb->mv_x = ref_mb->mv_x; - mb->mv_y = ref_mb->mv_y; - } - need_mc |= mb->mv_x || mb->mv_y; /* tracking non-zero motion vectors */ - { - int dmv_x, dmv_y, cx, cy; - - dmv_x = mb->mv_x >> band->is_halfpel; - dmv_y = mb->mv_y >> band->is_halfpel; - cx = mb->mv_x & band->is_halfpel; - cy = mb->mv_y & band->is_halfpel; - - if ( mb->xpos + dmv_x < 0 - || mb->xpos + dmv_x + band->mb_size + cx > band->pitch - || mb->ypos + dmv_y < 0 - || mb->ypos + dmv_y + band->mb_size + cy > band->aheight) { - av_log(avctx, AV_LOG_ERROR, "MV out of bounds\n"); - return AVERROR_INVALIDDATA; + if (band->inherit_qdelta) + mb->q_delta = ref_mb->q_delta; + + if (band->inherit_mv) { + /* motion vector inheritance */ + if (mv_scale) { + mb->mv_x = ivi_scale_mv(ref_mb->mv_x, mv_scale); + mb->mv_y = ivi_scale_mv(ref_mb->mv_y, mv_scale); + } else { + mb->mv_x = ref_mb->mv_x; + mb->mv_y = ref_mb->mv_y; + } + need_mc |= mb->mv_x || mb->mv_y; /* tracking non-zero motion vectors */ + { + int dmv_x, dmv_y, cx, cy; + + dmv_x = mb->mv_x >> band->is_halfpel; + dmv_y = mb->mv_y >> band->is_halfpel; + cx = mb->mv_x & band->is_halfpel; + cy = mb->mv_y & band->is_halfpel; + + if ( mb->xpos + dmv_x < 0 + || mb->xpos + dmv_x + band->mb_size + cx > band->pitch + || mb->ypos + dmv_y < 0 + || mb->ypos + dmv_y + band->mb_size + cy > band->aheight) { + av_log(avctx, AV_LOG_ERROR, "MV out of bounds\n"); + return AVERROR_INVALIDDATA; + } } } - } ref_mb++; } |