This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch release/7.1
in repository ffmpeg.

commit 96f225f3474ca8012cf6d53a51455f98ccfac609
Author:     James Almer <[email protected]>
AuthorDate: Sun Jun 14 10:06:27 2026 -0300
Commit:     James Almer <[email protected]>
CommitDate: Thu Sep 10 16:20:19 2026 -0300

    avformat/iamf_writer: reject muxing PCM streams
    
    Supporting PCM streams requires API changes present in newer releases that
    can't be backported, so don't create invalid files.
    
    Signed-off-by: James Almer <[email protected]>
    (cherry picked from commit 1034b144ff73aeae201ecbf132b3ca89b321ec16)
---
 libavformat/iamf_writer.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c
index 163d7e1200..8617469aa7 100644
--- a/libavformat/iamf_writer.c
+++ b/libavformat/iamf_writer.c
@@ -89,12 +89,6 @@ static int populate_audio_roll_distance(IAMFCodecConfig 
*codec_config)
         codec_config->audio_roll_distance = -1;
         break;
     case AV_CODEC_ID_FLAC:
-    case AV_CODEC_ID_PCM_S16BE:
-    case AV_CODEC_ID_PCM_S24BE:
-    case AV_CODEC_ID_PCM_S32BE:
-    case AV_CODEC_ID_PCM_S16LE:
-    case AV_CODEC_ID_PCM_S24LE:
-    case AV_CODEC_ID_PCM_S32LE:
         codec_config->audio_roll_distance = 0;
         break;
     default:
@@ -494,35 +488,12 @@ static int iamf_write_codec_config(const IAMFContext 
*iamf,
         avio_write(dyn_bc, codec_config->extradata, 
codec_config->extradata_size);
         break;
     case AV_CODEC_ID_PCM_S16LE:
-        avio_w8(dyn_bc, 1);
-        avio_w8(dyn_bc, 16);
-        avio_wb32(dyn_bc, codec_config->sample_rate);
-        break;
     case AV_CODEC_ID_PCM_S24LE:
-        avio_w8(dyn_bc, 1);
-        avio_w8(dyn_bc, 24);
-        avio_wb32(dyn_bc, codec_config->sample_rate);
-        break;
     case AV_CODEC_ID_PCM_S32LE:
-        avio_w8(dyn_bc, 1);
-        avio_w8(dyn_bc, 32);
-        avio_wb32(dyn_bc, codec_config->sample_rate);
-        break;
     case AV_CODEC_ID_PCM_S16BE:
-        avio_w8(dyn_bc, 0);
-        avio_w8(dyn_bc, 16);
-        avio_wb32(dyn_bc, codec_config->sample_rate);
-        break;
     case AV_CODEC_ID_PCM_S24BE:
-        avio_w8(dyn_bc, 0);
-        avio_w8(dyn_bc, 24);
-        avio_wb32(dyn_bc, codec_config->sample_rate);
-        break;
     case AV_CODEC_ID_PCM_S32BE:
-        avio_w8(dyn_bc, 0);
-        avio_w8(dyn_bc, 32);
-        avio_wb32(dyn_bc, codec_config->sample_rate);
-        break;
+        return AVERROR(ENOSYS);
     default:
         break;
     }

-- 
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to