[FFmpeg-devel] [PATCH 06/13] avformat/mux_utils: Don't report that AV_CODEC_ID_NONE can be muxed

[Andreas Rheinhardt]

If AVOutputFormat.video_codec, audio_codec or subtitle_codec
is AV_CODEC_ID_NONE, it means that there is no default codec
for this format and not that it is supported to mux AV_CODEC_ID_NONE.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavformat/mux_utils.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c
index 9d811c14e2..841a19a3a2 100644
--- a/libavformat/mux_utils.c
+++ b/libavformat/mux_utils.c
@@ -39,9 +39,10 @@ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
             return ffofmt(ofmt)->query_codec(codec_id, std_compliance);
         else if (ofmt->codec_tag)
             return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag);
-        else if (codec_id == ofmt->video_codec ||
-                 codec_id == ofmt->audio_codec ||
-                 codec_id == ofmt->subtitle_codec)
+        else if (codec_id != AV_CODEC_ID_NONE &&
+                 (codec_id == ofmt->video_codec ||
+                  codec_id == ofmt->audio_codec ||
+                  codec_id == ofmt->subtitle_codec))
             return 1;
     }
     return AVERROR_PATCHWELCOME;
-- 
2.40.1