From patchwork Fri Dec 6 23:16:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16656 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 622DE44AD30 for ; Sat, 7 Dec 2019 01:18:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D9A168B6E6; Sat, 7 Dec 2019 01:18:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFF9568B6DC for ; Sat, 7 Dec 2019 01:18:09 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id c9so9513662wrw.8 for ; Fri, 06 Dec 2019 15:18:09 -0800 (PST) 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=kHHyo0z3ZdWkmTVdukBVc6mSxpcFfm4FLIkqo7zSAaY=; b=A/a22+53YCWnuxlTNLjHpl5ZvO2CF5sS5Bluw+lLFUbHZ7lPZHr53Tf5ZWdl9eDH+R uNVBOq8Tm3SuZPh+zB5cDUyfV2rTEpzD4NPan5WMu7JriiqK+f0qK/6CDPjY3kTwURr6 vcZDB1IdXMBMOFZvUXHuUALYfaJkcqRqux+P8oH81FT3aQsdp2FoLddIA4iVMR6ezCoL 8djjXmjQbAFLUqV9JfWdvQ85K8k7AKukEU9kAnNEWKh9CHEgD5aLeh5XJ2nV4jRiD2AM 0Pfy1n+9HxkzYC19mlPhnN5InLPIb3hLjeJLMtRtO6tLeVCWeV0Df3DzTeH+1t7HNKbN YxzQ== 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=kHHyo0z3ZdWkmTVdukBVc6mSxpcFfm4FLIkqo7zSAaY=; b=kg+h16f/EhIh3bivi+JjsH/HL56IKrxmfjGxVYuQjPDIZB7g+2x5+PhV4avxtRXPVQ iALrpmdN5vXCi012sWh9dm40knowTubQrCsfwcfAxtHWS5QGZeD9jup0rRy45JT3em96 BjM6C6sjLvF4aTytFUfZtCg/HlTlh/iMPmQC8/PWiMFpONtdaJck8ANYJ1qu1TtqU8vm CcAcYPsaH/0cez6tjyd/pjaYGC9WwYD6oYgJbmj83xNeRnG4iKIYGu9+CGPWau6ywnWu PUIy0lQIZJbG21dA2PXIWIhYu+LJu4BJtd6tr4f9IAbiYw5LXhLv/PYnRgZ3NNa6T5RF 2Azw== X-Gm-Message-State: APjAAAXXBhT4mw7Jr450ihTfPDWkkcZ0O5JjL0UXs0N6pPFilJKG2aXx SyXEot+pZRMdHRU6KqEoFKC0+D8v X-Google-Smtp-Source: APXvYqxCkpd6p6EbWF11Dm3R1SU7nKFBnK/mC1GUG92/s1QgOXY26pzgigRbYgiy6zJumXDZfEvIGA== X-Received: by 2002:adf:f605:: with SMTP id t5mr17599379wrp.282.1575674289301; Fri, 06 Dec 2019 15:18:09 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id j12sm18758461wrw.54.2019.12.06.15.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 15:18:08 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Dec 2019 00:16:22 +0100 Message-Id: <20191206231622.13672-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191206231622.13672-1-andreas.rheinhardt@gmail.com> References: <20191206231622.13672-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/matroskadec: Reindent after previous commit 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 982dfdec39..5c10862d48 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3250,14 +3250,14 @@ static int matroska_parse_prores(MatroskaTrack *track, uint8_t *dst; int dstlen = *size + 8; - dst = av_malloc(dstlen + AV_INPUT_BUFFER_PADDING_SIZE); - if (!dst) - return AVERROR(ENOMEM); + dst = av_malloc(dstlen + AV_INPUT_BUFFER_PADDING_SIZE); + if (!dst) + return AVERROR(ENOMEM); - AV_WB32(dst, dstlen); - AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f')); - memcpy(dst + 8, *data, dstlen - 8); - memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE); + AV_WB32(dst, dstlen); + AV_WB32(dst + 4, MKBETAG('i', 'c', 'p', 'f')); + memcpy(dst + 8, *data, dstlen - 8); + memset(dst + dstlen, 0, AV_INPUT_BUFFER_PADDING_SIZE); *data = dst; *size = dstlen;