From patchwork Tue Nov 1 12:51:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adriano Pallavicino X-Patchwork-Id: 1248 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp646829vsb; Tue, 1 Nov 2016 05:59:40 -0700 (PDT) X-Received: by 10.28.40.67 with SMTP id o64mr1450970wmo.5.1478005180441; Tue, 01 Nov 2016 05:59:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id de2si36068042wjc.182.2016.11.01.05.59.39; Tue, 01 Nov 2016 05:59:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A048689CC0; Tue, 1 Nov 2016 14:59:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD1C1680780 for ; Tue, 1 Nov 2016 14:59:27 +0200 (EET) Received: by mail-wm0-f50.google.com with SMTP id a197so76473343wmd.0 for ; Tue, 01 Nov 2016 05:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to; bh=hMINHQdk+lV8jqc1yV2twa0aidemqXivCJ1yeSdyxQA=; b=nXkF+o30OwhgshvN8QleWxXKhrpL4zN7H0zzbKbBarVMzXJExnje/2DiW3mA0Vgd3t oM1QGcEHVjqdBt1+JlBhkzTUmI+9nneY7z/T8Wli+AYEDrYiPhWCNA9U6gBYDU7EIQF3 LEUNQJwKF3o7fVntanYT1rFQeh8dH6JH/qGpldxhhH8zVnKQ+NK8g30nQEQJlQpiIsEV 45tXtKLSM3eGoG7Xp/jV15nIfYAmeJ+4t5+acjjMXA365ZWQAYBpmJX8uVzmHfCVR5OZ ag+pJJxUtKc32wGRBOT2aaAip/aLTpvnfbqgAwdEbvK2SiLZxqLthFuyifR/WGVdJo8R c4xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=hMINHQdk+lV8jqc1yV2twa0aidemqXivCJ1yeSdyxQA=; b=AngqeNcz2Z62GSswUTLrwohuU+FLwO4stHU5/zTz9TnXnSmP/KqqNlkgb07dnqZlhH 7HgOYAbcajq97B273Znyl/bmdrlhO4OYlPaT/NTzTKdQpv+VzDNR1nCAspv0OsTEztGE Dzjjtv6bs18zBVSWXGie43p0yF65OppHIIGsMspap8tRz8T0dEpjMrhlTvL4zsmmX2W9 BO56VbJAEJIMOaBaH5z5QUx/qf4mgW6A5t9BlwkGANr31RYAb2UIFlC6D5/yHacIPGLV ov8vfLWNNVr7EkcmE9RJE9ON3oGQNE5txOsFPsN2pwtGwZMdy/ZPtF7q+xGwBoH7zDgi 8T1g== X-Gm-Message-State: ABUngvckLVxgK/sqGsNogArHdW5uiKOCX9I9/iWIDwkYaLDFNypwACagxDNvB5Vb2N7pWLGVWOQzJH397AkFHw== X-Received: by 10.28.94.139 with SMTP id s133mr1643447wmb.1.1478004665362; Tue, 01 Nov 2016 05:51:05 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.30.82 with HTTP; Tue, 1 Nov 2016 05:51:04 -0700 (PDT) From: Adriano Pallavicino Date: Tue, 1 Nov 2016 13:51:04 +0100 X-Google-Sender-Auth: 2T73kRmxiEyP_k1cEQaclAycO1g Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] fix warnings due to misleading indentation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 796426819c0dfb41666a39e94dca78db20d69ee9 Mon Sep 17 00:00:00 2001 From: Adriano Pallavicino Date: Tue, 1 Nov 2016 13:42:27 +0100 Subject: [PATCH] Fix build warnings due to misleading indentation Signed-off-by: Adriano Pallavicino Changes to be committed: modified: libavcodec/mpegvideo.c modified: libavfilter/vf_paletteuse.c modified: libavformat/matroskaenc.c --- libavcodec/mpegvideo.c | 54 ++++++++++++++++++++++----------------------- libavfilter/vf_paletteuse.c | 2 +- libavformat/matroskaenc.c | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index eb14b8c..9a17a6e 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); diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index e063ff7..75d80d6 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -444,7 +444,7 @@ static av_always_inline int set_frame(PaletteUseContext *s, AVFrame *out, AVFram if (down) { if (left2) src[ src_linesize + x - 2] = dither_color(src[ src_linesize + x - 2], er, eg, eb, 1, 4); if (left) src[ src_linesize + x - 1] = dither_color(src[ src_linesize + x - 1], er, eg, eb, 2, 4); - src[ src_linesize + x ] = dither_color(src[ src_linesize + x ], er, eg, eb, 3, 4); + src[ src_linesize + x ] = dither_color(src[ src_linesize + x ], er, eg, eb, 3, 4); if (right) src[ src_linesize + x + 1] = dither_color(src[ src_linesize + x + 1], er, eg, eb, 2, 4); if (right2) src[ src_linesize + x + 2] = dither_color(src[ src_linesize + x + 2], er, eg, eb, 1, 4); } diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d91055f..5704119 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -755,16 +755,16 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, if (!par->codec_tag) par->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags, par->codec_id); - if ( ff_codec_get_id(ff_codec_movvideo_tags, par->codec_tag) == par->codec_id - && (!par->extradata_size || ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(par->extradata + 4)) != par->codec_id) - ) { - int i; - avio_wb32(dyn_cp, 0x5a + par->extradata_size); - avio_wl32(dyn_cp, par->codec_tag); - for(i = 0; i < 0x5a - 8; i++) - avio_w8(dyn_cp, 0); - } - avio_write(dyn_cp, par->extradata, par->extradata_size); + if ( ff_codec_get_id(ff_codec_movvideo_tags, par->codec_tag) == par->codec_id + && (!par->extradata_size || ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(par->extradata + 4)) != par->codec_id) + ) { + int i; + avio_wb32(dyn_cp, 0x5a + par->extradata_size); + avio_wl32(dyn_cp, par->codec_tag); + for(i = 0; i < 0x5a - 8; i++) + avio_w8(dyn_cp, 0); + } + avio_write(dyn_cp, par->extradata, par->extradata_size); } else { if (!ff_codec_get_tag(ff_codec_bmp_tags, par->codec_id)) av_log(s, AV_LOG_WARNING, "codec %s is not supported by this format\n", -- 2.7.4