diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 14:12:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 14:12:46 +0200 |
| commit | b06e82e73897e7afd1363f60015f5cbf6d39c984 (patch) | |
| tree | 74177e40f4d6737307317a177055f8ed749c69ae /libavformat | |
| parent | 5a3d2541bd59b52e9357f3f55499e98c3d4e522a (diff) | |
| parent | 4792fb94098cf47bd8caf9b3a9795c666bae2220 (diff) | |
| download | ffmpeg-b06e82e73897e7afd1363f60015f5cbf6d39c984.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/x264: Support bgr0 as input pix_fmt.
lavf: Use av_codec_get_tag2() in avformat_query_codec().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index db2b4f6768..7af2aabd80 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) |