From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7588F46FE3 for ; Wed, 26 Jul 2023 03:46:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AC8068C7FC; Wed, 26 Jul 2023 06:45:58 +0300 (EEST) Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C69168C649 for ; Wed, 26 Jul 2023 06:45:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1690343141; bh=BX+tMZcseGCpcPRgqM4QckCBXl+4CZ6SXVa7p56FIcc=; h=From:To:Cc:Subject:Date; b=a5mb10Ou6HmwOqeyWRhuEAS7h5GxWcvA5nLQAIE2txVFa/epmOxnmWFCEs0xdF75a Z2S0hcPCGzl3DL0drXrqFiodlcfxQQn+Re9T4K1xjqLhZCvtLpei6vN4yGj9rex8uR IVOs1n9Icx4omka/AGOJquLaHmX24vbJ2XMBiFZU= Received: from zhilizhao-PC5.tencent.com ([119.147.10.199]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id B68AB0A2; Wed, 26 Jul 2023 11:45:40 +0800 X-QQ-mid: xmsmtpt1690343140ts9g34x7j Message-ID: X-QQ-XMAILINFO: OdIVOfqOaVcrRDD42snjaB+YGE629ai8cD/iMd+A3jYNlR3kEfe/A7vxHiMjSD y7Yv7PgUe6FIBgzm99hR0+TdiNLhf9bqfcMq7mkw2yl0kvJsTIGDOYL9YHSrIzsDMzp5LizZCrEb sh03nEgrEtaGfzfs6F0Q/N5DcOxbedzlMUSk2G0BJVFAPHNbOaLIDPqzI6xA5Mq/u9a0+1s9s51l DI56JiQLWIsRp9cLDHxRXx1L2VP19u+mFmz+DNCuTMi5Qo3di0G2aKCEbuHWR4ymB5RmBqtCKv0D Mu2jd3kEjjz8KuFR/r0V5oyqIjLZhh06ITAQL+/RuechPnlGmLJERThXgdh4QvI4i7BJHFs9zVTb kjCTHTjhOUXcwSY5KDIACvU589tILfj6+0uGs01cSosYI05tOLc5Cg91o8Y7DpsKCR07YhFjVLyt N4+RIUhI5qCyF0uYbnqkSmNzl7pwc9byWiunPyji00i6gMrwnVBdcni7Xcyh6JVXg89TPl/H41zO kGuZrilE4HAvybtD03Vgj1Z22Fddb/kstUy21e85vIwG6spXQs91phIPN0g500AtmFPlLyv0DH/R sWEAd/lUV1ktcJ6+xyGG0+xc6Mducki4xO+7KZ5aHtr28EzQBaaVbawwEjR92SnrQUacCj8t/S8y /w8TcK3tD675tSgAHsCBlDusgWDSIRGGy33NdXEb19/tM6zlp2EonAVpGOlVF1iqSzqURKsXSgyS vpc17GiyZiKTO49nNldaeuLAd9F0tw7XPxYCudDzyN5dbveP39VllNRtDjKBBtB3OS3+GhKf1h+g V0erjz38Tw/6CcDe9snohtHLGesg8dpdNF8g5G+n4y4SiRDQe4CeGtD4EHlgAPp/+4ibuxXY9N+3 Mx88jCrY+YeSV2wmVhOGyXhS5wGmVQoKRNIrI0ymAbSuSTirLcA89FOa+eAPFMsJc6SFjbzpXauz +iM5AGmIGuk3428Kus8p2SKJ9/J7zf X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 11:45:38 +0800 X-OQ-MSGID: <20230726034539.29616-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/movenc: fix sample size being zero in pcmC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili bits_per_raw_sample might not set when remux raw PCM. Fix #10433. --- libavformat/movenc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f1cc80b1b3..7ef6cef46a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1225,6 +1225,7 @@ static int mov_write_pcmc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra { int64_t pos = avio_tell(pb); int format_flags; + int sample_size; avio_wb32(pb, 0); /* size */ ffio_wfourcc(pb, "pcmC"); @@ -1237,7 +1238,11 @@ static int mov_write_pcmc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra track->par->codec_id == AV_CODEC_ID_PCM_S24LE || track->par->codec_id == AV_CODEC_ID_PCM_S32LE); avio_w8(pb, format_flags); - avio_w8(pb, track->par->bits_per_raw_sample); + sample_size = track->par->bits_per_raw_sample; + if (!sample_size) + sample_size = av_get_exact_bits_per_sample(track->par->codec_id); + av_assert0(sample_size); + avio_w8(pb, sample_size); return update_size(pb, pos); } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".