From patchwork Wed Oct 14 21:49:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 22955 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 39D9344AC16 for ; Thu, 15 Oct 2020 00:50:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F03568BA16; Thu, 15 Oct 2020 00:50:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2E6A68B7EB for ; Thu, 15 Oct 2020 00:50:06 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id m22so1101112ots.4 for ; Wed, 14 Oct 2020 14:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gK3XAnIn8049YqcA1TsyUQYg6w1gGg7Uw4xwvqncoeI=; b=gn/D8X9ViHWa2jcJGCWgapNkZ0zdt2EKhwfp0iSbQ5XFYiSIBQrYszDRoU6EPtq6bw rXxvgV+o2KcLTON3PxSHNKBDQ8MuJzIwbvP1nZgmUrlVYDIL/akpXSBlcDTBI4y+M63p +VsovCC4Lyvw/9ON/AlQEDE0g6eEGsiHzRQbTR8rs78+Y8xDJhmVTtdQArtkU6Zo8RZH ZvYYW3P96iYUkEHsutKit7KY7/Q26H8eibd3UsHkl2YFOMnNzbRpaJskkv0KRtgESk1p wKFlIXGGFAhN+wodKkq4Ybf003Frr3Vj1Vmd8QwGKFdYkOMeopoCHVhXUDopRILiU34q q7TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gK3XAnIn8049YqcA1TsyUQYg6w1gGg7Uw4xwvqncoeI=; b=hrBR5p7vxDUOeylOvn1fvz0LJRVeZe/Ko+cRHhXvquj0HdTmfzBKAfjRfgLvs7g+ZO N2d5SHmlX1dijU+Hri5ZJO33yFHioSrJImy62IveTaicRIgntvLirZiczLJtFCjmvqYW tYp/6i80ogW+qWq1ImeXflP5iHe07GQ749CzE988yd6uo5kys3wscARnbSbmdRqfp5VA b2YGSbMhQ3h+jM7OSe9huhS71CqEmSMsXFFAgqEw6ZEjA5xkOHb73HVLn2QcrLyFQp2I SuVc/cCK9F0JaKKXkaM5ddWkjuwIruigbselgNdNtrD0auEkCu5wehoaUARo5TlLKHf+ q7fA== X-Gm-Message-State: AOAM533BiyRj3OlmRKHDEv3OBGii3V2s6pu2oUENHTaoybY7KuwGLJXn NxZDth/MDGZCyKqGw+uXP0kLhIPZY/8= X-Google-Smtp-Source: ABdhPJxDDjIT5TR4COHwum0qzKYITiN+tf0fW38lucjWdZqEX21uHGZ/X9PwD6vsA+YcoHQaE2yLTg== X-Received: by 2002:a9d:1e86:: with SMTP id n6mr578872otn.94.1602712205383; Wed, 14 Oct 2020 14:50:05 -0700 (PDT) Received: from manj.guest.slb.com ([192.23.22.241]) by smtp.gmail.com with ESMTPSA id y10sm388567oot.46.2020.10.14.14.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 14:50:04 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Oct 2020 17:49:08 -0400 Message-Id: <20201014214908.279899-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201014214908.279899-1-andriy.gelman@gmail.com> References: <20201014214908.279899-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/movtextenc: cosmetics 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 Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Change pointer position. Signed-off-by: Andriy Gelman --- libavcodec/movtextenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index f38cd9cba2..5f60b8db61 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -83,7 +83,7 @@ typedef struct { StyleBox d; uint16_t text_pos; uint16_t byte_count; - char ** fonts; + char **fonts; int font_count; double font_scale_factor; int frame_height; @@ -202,8 +202,8 @@ static int mov_text_encode_close(AVCodecContext *avctx) static int encode_sample_description(AVCodecContext *avctx) { - ASS * ass; - ASSStyle * style; + ASS *ass; + ASSStyle *style; int i, j; uint32_t tsmb_size, tsmb_type, back_color, style_color; uint16_t style_start, style_end, fontID, count; @@ -538,7 +538,7 @@ static void mov_text_alpha_cb(void *priv, int alpha, int alpha_id) // Movtext does not support changes to other alpha_id (outline, background) } -static uint16_t find_font_id(MovTextContext * s, const char * name) +static uint16_t find_font_id(MovTextContext *s, const char *name) { int i; for (i = 0; i < s->font_count; i++) { @@ -612,16 +612,16 @@ static void mov_text_ass_style_set(MovTextContext *s, ASSStyle *style) static void mov_text_dialog(MovTextContext *s, ASSDialog *dialog) { - ASSStyle * style = ff_ass_style_get(s->ass_ctx, dialog->style); + ASSStyle *style = ff_ass_style_get(s->ass_ctx, dialog->style); s->ass_dialog_style = style; mov_text_ass_style_set(s, style); } -static void mov_text_cancel_overrides_cb(void *priv, const char * style_name) +static void mov_text_cancel_overrides_cb(void *priv, const char *style_name) { MovTextContext *s = priv; - ASSStyle * style; + ASSStyle *style; if (!style_name || !*style_name) style = s->ass_dialog_style;