virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavf: Use av_codec_get_tag2() in avformat_query_codec().

Browse Source 
av_codec_get_tag() can return 0 both in case of error and success.
This commit is contained in:
Carl Eugen Hoyos
2015-05-28 12:31:40 +02:00
parent bcd7bf7eeb
commit 57eecd9e4f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/utils.c
View File

@@ -4107,10 +4107,11 @@ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
int std_compliance) int std_compliance)
{ {
if (ofmt) { if (ofmt) {
unsigned int codec_tag;
if (ofmt->query_codec) if (ofmt->query_codec)
return ofmt->query_codec(codec_id, std_compliance); return ofmt->query_codec(codec_id, std_compliance);
else if (ofmt->codec_tag) else if (ofmt->codec_tag)
return !!av_codec_get_tag(ofmt->codec_tag, codec_id); return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag);
else if (codec_id == ofmt->video_codec || else if (codec_id == ofmt->video_codec ||
codec_id == ofmt->audio_codec || codec_id == ofmt->audio_codec ||
codec_id == ofmt->subtitle_codec) codec_id == ofmt->subtitle_codec)