[FFmpeg-cvslog] avformat/lc3: Only allow AV_CODEC_ID_LC3 in muxer

Andreas Rheinhardt git at videolan.org
Tue Apr 16 23:02:32 EEST 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Apr 16 19:14:30 2024 +0200| [639013aafcd9c534c487070c468e2f5309975fe1] | committer: Andreas Rheinhardt

avformat/lc3: Only allow AV_CODEC_ID_LC3 in muxer

Also check for the number of streams and the AVCodecID generically
using FF_OFMT_FLAGs.

Reviewed-by: Stefano Sabatini <stefasab at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=639013aafcd9c534c487070c468e2f5309975fe1
---

 libavformat/lc3.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/libavformat/lc3.c b/libavformat/lc3.c
index 93ce720af3..16c12a98d7 100644
--- a/libavformat/lc3.c
+++ b/libavformat/lc3.c
@@ -186,16 +186,6 @@ const FFInputFormat ff_lc3_demuxer = {
 
 #if CONFIG_LC3_MUXER
 
-static av_cold int lc3_muxer_init(AVFormatContext *s)
-{
-    if (s->nb_streams != 1) {
-        av_log(s, AV_LOG_ERROR, "This muxer only supports a single stream.\n");
-        return AVERROR(EINVAL);
-    }
-
-    return 0;
-}
-
 static int lc3_write_header(AVFormatContext *s)
 {
     AVStream *st = s->streams[0];
@@ -243,8 +233,10 @@ const FFOutputFormat ff_lc3_muxer = {
     .p.extensions  = "lc3",
     .p.audio_codec = AV_CODEC_ID_LC3,
     .p.video_codec = AV_CODEC_ID_NONE,
+    .p.subtitle_codec = AV_CODEC_ID_NONE,
     .p.flags       = AVFMT_NOTIMESTAMPS,
-    .init          = lc3_muxer_init,
+    .flags_internal   = FF_OFMT_FLAG_MAX_ONE_OF_EACH |
+                        FF_OFMT_FLAG_ONLY_DEFAULT_CODECS,
     .write_header  = lc3_write_header,
     .write_packet  = lc3_write_packet,
 };



More information about the ffmpeg-cvslog mailing list