[FFmpeg-cvslog] Use new function av_codec_get_tag2() in ffmpeg.c.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Jan 17 20:46:21 2013 +0100| [9a038a95d2769d8a4cfa08dff88d7484bf69549d] | committer: Carl Eugen Hoyos

Use new function av_codec_get_tag2() in ffmpeg.c.

Fixes ticket #1953.

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

 ffmpeg.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index acaa523..abfe439 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;
             }