diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-17 20:46:21 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-17 20:46:21 +0100 |
| commit | 9a038a95d2769d8a4cfa08dff88d7484bf69549d (patch) | |
| tree | ff80416f90d1987217639da1938137abad4da56d /ffmpeg.c | |
| parent | a1a707f7280a08d6686732e1ab911dd44663889c (diff) | |
| download | ffmpeg-streaming-9a038a95d2769d8a4cfa08dff88d7484bf69549d.zip ffmpeg-streaming-9a038a95d2769d8a4cfa08dff88d7484bf69549d.tar.gz | |
Use new function av_codec_get_tag2() in ffmpeg.c.
Fixes ticket #1953.
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; } |
