diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-03-19 19:42:55 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-03-22 23:57:19 +0100 |
| commit | a48e839a221d8470071a367b6a7be1bc022ba6e7 (patch) | |
| tree | 9896937434913e49fbfbf202e85c36ee9c8e8154 | |
| parent | 789c5b03db3b5e11387e40e774030ac316783ffb (diff) | |
| download | ffmpeg-a48e839a221d8470071a367b6a7be1bc022ba6e7.tar.gz | |
avformat/mux_utils: Don't report that AV_CODEC_ID_NONE can be muxed
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@outlook.com>
| -rw-r--r-- | libavformat/mux_utils.c | 7 |
1 files 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; |