summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAdriano Pallavicino <adriano.pallavicino@gmail.com>2016-11-01 13:42:27 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-11-01 17:44:10 +0100
commit6089c44a2af1394bb34257814ba50e05b84112ec (patch)
treeba8b250f72e6e612939cfe7149563cf71f6bdfe5 /libavcodec
parent584f509a4b9eeff375d99483bf55d7a1faa5d9aa (diff)
Fix build warnings due to misleading indentation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index eb14b8c9c1..9a17a6e25c 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -940,37 +940,37 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
if (!s->new_picture.f)
goto fail;
- if (init_context_frame(s))
- goto fail;
+ if (init_context_frame(s))
+ goto fail;
- s->parse_context.state = -1;
+ s->parse_context.state = -1;
- s->context_initialized = 1;
- memset(s->thread_context, 0, sizeof(s->thread_context));
- s->thread_context[0] = s;
+ s->context_initialized = 1;
+ memset(s->thread_context, 0, sizeof(s->thread_context));
+ s->thread_context[0] = s;
// if (s->width && s->height) {
- if (nb_slices > 1) {
- for (i = 0; i < nb_slices; i++) {
- if (i) {
- s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
- if (!s->thread_context[i])
- goto fail;
- }
- if (init_duplicate_context(s->thread_context[i]) < 0)
+ if (nb_slices > 1) {
+ for (i = 0; i < nb_slices; i++) {
+ if (i) {
+ s->thread_context[i] = av_memdup(s, sizeof(MpegEncContext));
+ if (!s->thread_context[i])
goto fail;
- s->thread_context[i]->start_mb_y =
- (s->mb_height * (i) + nb_slices / 2) / nb_slices;
- s->thread_context[i]->end_mb_y =
- (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
}
- } else {
- if (init_duplicate_context(s) < 0)
+ if (init_duplicate_context(s->thread_context[i]) < 0)
goto fail;
- s->start_mb_y = 0;
- s->end_mb_y = s->mb_height;
+ s->thread_context[i]->start_mb_y =
+ (s->mb_height * (i) + nb_slices / 2) / nb_slices;
+ s->thread_context[i]->end_mb_y =
+ (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
}
- s->slice_context_count = nb_slices;
+ } else {
+ if (init_duplicate_context(s) < 0)
+ goto fail;
+ s->start_mb_y = 0;
+ s->end_mb_y = s->mb_height;
+ }
+ s->slice_context_count = nb_slices;
// }
return 0;
@@ -1090,10 +1090,10 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
}
if ((err = init_duplicate_context(s->thread_context[i])) < 0)
goto fail;
- s->thread_context[i]->start_mb_y =
- (s->mb_height * (i) + nb_slices / 2) / nb_slices;
- s->thread_context[i]->end_mb_y =
- (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
+ s->thread_context[i]->start_mb_y =
+ (s->mb_height * (i) + nb_slices / 2) / nb_slices;
+ s->thread_context[i]->end_mb_y =
+ (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
}
} else {
err = init_duplicate_context(s);