From 0c02ad857c624d75de1c6fa85098d1752dfdb771 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Wed, 26 Jul 2023 11:45:38 +0800 Subject: [PATCH] avformat/movenc: fix sample size being zero in pcmC bits_per_raw_sample might not set when remux raw PCM. Fix #10433. Signed-off-by: Zhao Zhili --- 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); }