highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/ivi: fix indention for previous commit

Browse Source
This commit is contained in:
Michael Niedermayer 2019-03-24 22:52:19 +01:00
parent c163e62db5
commit 111e9b0929
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libavcodec/ivi.c
View File

@ -807,36 +807,36 @@ static int ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band,
} }
if (ref_mb) { if (ref_mb) {
if (band->inherit_qdelta) if (band->inherit_qdelta)
mb->q_delta = ref_mb->q_delta; mb->q_delta = ref_mb->q_delta;
if (band->inherit_mv) { 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);
mb->mv_y = ivi_scale_mv(ref_mb->mv_y, mv_scale); mb->mv_y = ivi_scale_mv(ref_mb->mv_y, mv_scale);
} else { } else {
mb->mv_x = ref_mb->mv_x; mb->mv_x = ref_mb->mv_x;
mb->mv_y = ref_mb->mv_y; mb->mv_y = ref_mb->mv_y;
} }
need_mc |= mb->mv_x || mb->mv_y; /* tracking non-zero motion vectors */ need_mc |= mb->mv_x || mb->mv_y; /* tracking non-zero motion vectors */
{ {
int dmv_x, dmv_y, cx, cy; int dmv_x, dmv_y, cx, cy;
dmv_x = mb->mv_x >> band->is_halfpel; dmv_x = mb->mv_x >> band->is_halfpel;
dmv_y = mb->mv_y >> band->is_halfpel; dmv_y = mb->mv_y >> band->is_halfpel;
cx = mb->mv_x & band->is_halfpel; cx = mb->mv_x & band->is_halfpel;
cy = mb->mv_y & band->is_halfpel; cy = mb->mv_y & band->is_halfpel;
if ( mb->xpos + dmv_x < 0 if ( mb->xpos + dmv_x < 0
|| mb->xpos + dmv_x + band->mb_size + cx > band->pitch || mb->xpos + dmv_x + band->mb_size + cx > band->pitch
|| mb->ypos + dmv_y < 0 || mb->ypos + dmv_y < 0
|| mb->ypos + dmv_y + band->mb_size + cy > band->aheight) { || mb->ypos + dmv_y + band->mb_size + cy > band->aheight) {
av_log(avctx, AV_LOG_ERROR, "MV out of bounds\n"); av_log(avctx, AV_LOG_ERROR, "MV out of bounds\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
} }
} }
}
ref_mb++; ref_mb++;
} }