mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-19 04:53:25 +00:00
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>
This commit is contained in:
parent
789c5b03db
commit
a48e839a22
@ -39,9 +39,10 @@ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
|
|||||||
return ffofmt(ofmt)->query_codec(codec_id, std_compliance);
|
return ffofmt(ofmt)->query_codec(codec_id, std_compliance);
|
||||||
else if (ofmt->codec_tag)
|
else if (ofmt->codec_tag)
|
||||||
return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag);
|
return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag);
|
||||||
else if (codec_id == ofmt->video_codec ||
|
else if (codec_id != AV_CODEC_ID_NONE &&
|
||||||
codec_id == ofmt->audio_codec ||
|
(codec_id == ofmt->video_codec ||
|
||||||
codec_id == ofmt->subtitle_codec)
|
codec_id == ofmt->audio_codec ||
|
||||||
|
codec_id == ofmt->subtitle_codec))
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return AVERROR_PATCHWELCOME;
|
return AVERROR_PATCHWELCOME;
|
||||||
|
Loading…
Reference in New Issue
Block a user