From: Zhao Zhili <quinkblack@foxmail.com> To: ffmpeg-devel@ffmpeg.org Cc: Zhao Zhili <zhilizhao@tencent.com> Subject: [FFmpeg-devel] [PATCH 1/2] avformat/movenc: fix sample size being zero in pcmC Date: Wed, 26 Jul 2023 11:45:38 +0800 Message-ID: <tencent_BE009D6AA67FAEAD3A3BB9C1F9B4A4692E0A@qq.com> (raw) From: Zhao Zhili <zhilizhao@tencent.com> 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".
next reply other threads:[~2023-07-26 3:46 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-26 3:45 Zhao Zhili [this message] 2023-07-26 13:37 ` Raphaël Zumer 2023-07-26 15:22 ` Zhao Zhili 2023-07-26 17:03 ` Raphaël Zumer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tencent_BE009D6AA67FAEAD3A3BB9C1F9B4A4692E0A@qq.com \ --to=quinkblack@foxmail.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=zhilizhao@tencent.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git