[FFmpeg-cvslog] lavf: Use av_codec_get_tag2() in avformat_query_codec().

Carl Eugen Hoyos git at videolan.org
Thu May 28 14:39:25 CEST 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu May 28 12:31:40 2015 +0200| [57eecd9e4f8d68277b937c6ea9924fa3a4524fe4] | committer: Carl Eugen Hoyos

lavf: Use av_codec_get_tag2() in avformat_query_codec().

av_codec_get_tag() can return 0 both in case of error and success.

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

 libavformat/utils.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index db2b4f6..7af2aab 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4107,10 +4107,11 @@ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
                          int std_compliance)
 {
     if (ofmt) {
+        unsigned int codec_tag;
         if (ofmt->query_codec)
             return ofmt->query_codec(codec_id, std_compliance);
         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 ||
                  codec_id == ofmt->audio_codec ||
                  codec_id == ofmt->subtitle_codec)



More information about the ffmpeg-cvslog mailing list