aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-17 20:46:21 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-17 20:46:21 +0100
commit9a038a95d2769d8a4cfa08dff88d7484bf69549d (patch)
treeff80416f90d1987217639da1938137abad4da56d
parenta1a707f7280a08d6686732e1ab911dd44663889c (diff)
downloadffmpeg-9a038a95d2769d8a4cfa08dff88d7484bf69549d.tar.gz
Use new function av_codec_get_tag2() in ffmpeg.c.
Fixes ticket #1953.
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index acaa523170..abfe439d95 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2046,9 +2046,10 @@ static int transcode_init(void)
codec->codec_type = icodec->codec_type;
if (!codec->codec_tag) {
+ unsigned int codec_tag;
if (!oc->oformat->codec_tag ||
av_codec_get_id (oc->oformat->codec_tag, icodec->codec_tag) == codec->codec_id ||
- av_codec_get_tag(oc->oformat->codec_tag, icodec->codec_id) <= 0)
+ !av_codec_get_tag2(oc->oformat->codec_tag, icodec->codec_id, &codec_tag))
codec->codec_tag = icodec->codec_tag;
}