diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-12 19:23:58 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-20 07:56:17 +0200 |
commit | db42f70b3f5a4382903ad18ec3115c84eecc1cb9 (patch) | |
tree | dfb0319b1b885ca856bdb3135369f3f65559c631 /libavcodec | |
parent | 77f8d2da9de33b791a7d6b88fe89e77b25daca5c (diff) |
avcodec/mpeg4videodec: Reindent after the previous commit
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/mpeg4videodec.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index b4e2c09706..c4f268c534 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2001,25 +2001,25 @@ intra: end: /* per-MB end of slice check */ next = mpeg4_is_resync(ctx); - if (next) { - if (s->mb_x + s->mb_y*s->mb_width + 1 > next && (s->avctx->err_recognition & AV_EF_AGGRESSIVE)) { - return AVERROR_INVALIDDATA; - } else if (s->mb_x + s->mb_y*s->mb_width + 1 >= next) - return SLICE_END; - - if (s->pict_type == AV_PICTURE_TYPE_B) { - const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1; - ff_thread_await_progress(&s->next_picture_ptr->tf, - (s->mb_x + delta >= s->mb_width) - ? FFMIN(s->mb_y + 1, s->mb_height - 1) - : s->mb_y, 0); - if (s->next_picture.mbskip_table[xy + delta]) - return SLICE_OK; - } - + if (next) { + if (s->mb_x + s->mb_y*s->mb_width + 1 > next && (s->avctx->err_recognition & AV_EF_AGGRESSIVE)) { + return AVERROR_INVALIDDATA; + } else if (s->mb_x + s->mb_y*s->mb_width + 1 >= next) return SLICE_END; + + if (s->pict_type == AV_PICTURE_TYPE_B) { + const int delta = s->mb_x + 1 == s->mb_width ? 2 : 1; + ff_thread_await_progress(&s->next_picture_ptr->tf, + (s->mb_x + delta >= s->mb_width) + ? FFMIN(s->mb_y + 1, s->mb_height - 1) + : s->mb_y, 0); + if (s->next_picture.mbskip_table[xy + delta]) + return SLICE_OK; } + return SLICE_END; + } + return SLICE_OK; } |