[FFmpeg-devel] [PATCH 2/2] avformat/mpegenc - reject unsupported audio streams

[Gyan Doshi]

On 2/23/2018 3:50 AM, Carl Eugen Hoyos wrote:
> 
> Please also mention "mp1" and "pcm_dvd" in the log message.

Revised patch attached.
-------------- next part --------------
From 0bb6debc91c59a10fd43dc4670bd513adab1f1e0 Mon Sep 17 00:00:00 2001
From: Gyan Doshi <gyandoshi at gmail.com>
Date: Tue, 20 Feb 2018 20:42:21 +0530
Subject: [PATCH] avformat/mpegenc - reject unsupported audio streams

Only MP1, MP2, MP3, 16-bit PCM_DVD, PCM S16BE,
AC3 and DTS audio codecs are supported by the muxer.
---
 libavformat/mpegenc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 4c6fa67fb8..8b33468dff 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -392,6 +392,11 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx)
                 stream->lpcm_header[1] = (st->codecpar->channels - 1) | (j << 4);
                 stream->lpcm_header[2] = 0x80;
                 stream->lpcm_align     = st->codecpar->channels * 2;
+            } else if (st->codecpar->codec_id != AV_CODEC_ID_MP1 &&
+                       st->codecpar->codec_id != AV_CODEC_ID_MP2 &&
+                       st->codecpar->codec_id != AV_CODEC_ID_MP3) {
+                       av_log(ctx, AV_LOG_ERROR, "Unsupported audio codec. Must be one of mp1, mp2, mp3, 16-bit pcm_dvd, pcm_s16be, ac3 or dts.\n");
+                       goto fail;
             } else {
                 stream->id = mpa_id++;
             }
-- 
2.12.2.windows.2