From patchwork Sat Sep 21 02:12:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 15197 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 8B6904463BD for ; Sat, 21 Sep 2019 05:12:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78A9A68A41E; Sat, 21 Sep 2019 05:12:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03DA468A35D for ; Sat, 21 Sep 2019 05:12:47 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id n9so4883453pgc.1 for ; Fri, 20 Sep 2019 19:12:47 -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; bh=+sDN+md/pY/WYvXhgm610igm2xBGaqKBh0D0EPDE30g=; b=kQ+lokAd05D0uPSSbUNv06RqTPsl5YAKTuAaabsNUxxSW0EdXpA/vACbzdb4Pik09K jAnrOselzaqJWIxUBDM/hKxxjpVZt2U4+oTbeknl8D0VG4v72BZmP5dLcTxfu6+Ngg4o bFBPJcAGObsMa1WTQqR0i7QRGadDYF48lp7fjAogRQfwa0l7mr/Ez+6ykkE4DcAuU4RT +L6TxaT7jqc3tYoLIVfiseKn9qNRtoz/3jiq1IcGFtoE0nYoI7DAH4BTI1wDDAYCcfK1 aoFV2O7+E5ynQDb38Aich1dqWLBN7u+pBSAydETftRKFfUXQ6gfBATEx1x+E47rgXplo /GJQ== 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; bh=+sDN+md/pY/WYvXhgm610igm2xBGaqKBh0D0EPDE30g=; b=MqfgKgIjH4P/vOiQvfFPcyYRarSK9dWFaEzvfqnhbq0cW7lVQR7jJiX+b/0viJluQi HdTiUVpn6ztkFaKsMZeAWmkp4BQLYCa+H/LRRDcPUtd1ggYCwv0HvnL6Edu16YdhLRzc g3+spbczpWdRg2tn0323iXawMqWwGmCOjsmlj9q1pWNVvLI4ypPxSEKLPzd1Nz6RQ2d+ 014hgSV8x9gzvxGkamxpdFhLAD41bq6lII6n7GS4cJ7B/ayFg/SZuuD7aybGyqmSBGEb ABSAaumf4s20OXSQ3i2H4we0raGXD3CkjgyoNAUGzvQBTXrjiVXCJDCUQMMJG1q1bk6I I6Fg== X-Gm-Message-State: APjAAAUciId2fPn3lVAETrRQ5MsjWpkgIBYlJS9AG5G2vjl/awbC7yJW YLVbH8isxqM6y8Hk6sFufeuoVCfV X-Google-Smtp-Source: APXvYqzOGHla5W1AMQqL1KvKIn3QgjP0HSsqxYM/8MXImU0WcJs8fDjceOkYJ2WaGmvrnJ51N5yD2g== X-Received: by 2002:aa7:9ab4:: with SMTP id x20mr21662699pfi.59.1569031966362; Fri, 20 Sep 2019 19:12:46 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id l7sm8986688pga.92.2019.09.20.19.12.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Sep 2019 19:12:45 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Sep 2019 10:12:15 +0800 Message-Id: <1569031935-8967-6-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1569031935-8967-1-git-send-email-mypopydev@gmail.com> References: <1569031935-8967-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 6/6] lavf/matroskaenc: use initialized var for avpriv_mpeg4audio_get_config 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao avpriv_mpeg4audio_get_config will use MPEG4AudioConfig.chan_config to get the MPEG4AudioConfig.channels, but if we use a uninitialized variable, we will get an indeterminate channels, add an explicit initialization for this case. Signed-off-by: Jun Zhao --- libavformat/matroskaenc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index cef504f..a0dc619 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -714,7 +714,7 @@ static int put_flac_codecpriv(AVFormatContext *s, static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extradata_size, int *sample_rate, int *output_sample_rate) { - MPEG4AudioConfig mp4ac; + MPEG4AudioConfig mp4ac = {0}; int ret; ret = avpriv_mpeg4audio_get_config(&mp4ac, extradata,