Commit 9a038a95 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Use new function av_codec_get_tag2() in ffmpeg.c.

Fixes ticket #1953.
parent a1a707f7
...@@ -2046,9 +2046,10 @@ static int transcode_init(void) ...@@ -2046,9 +2046,10 @@ static int transcode_init(void)
codec->codec_type = icodec->codec_type; codec->codec_type = icodec->codec_type;
if (!codec->codec_tag) { if (!codec->codec_tag) {
unsigned int codec_tag;
if (!oc->oformat->codec_tag || if (!oc->oformat->codec_tag ||
av_codec_get_id (oc->oformat->codec_tag, icodec->codec_tag) == codec->codec_id || 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; codec->codec_tag = icodec->codec_tag;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment