[FFmpeg-cvslog] avcodec/ivi: fix indention for previous commit
Michael Niedermayer
git at videolan.org
Mon Apr 1 00:26:36 EEST 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Mar 24 22:52:19 2019 +0100| [111e9b0929ab881f2735ca3036cb43b73ab4fe61] | committer: Michael Niedermayer
avcodec/ivi: fix indention for previous commit
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=111e9b0929ab881f2735ca3036cb43b73ab4fe61
---
libavcodec/ivi.c | 56 ++++++++++++++++++++++++++++----------------------------
1 file 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++;
}
More information about the ffmpeg-cvslog
mailing list