[SCM] libav/experimental: lavc: do not use AVCodecContext.codec_name in avcodec_string()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e7fc9796d82abc99ef0af71027fb9aaa5311d137
Author: Anton Khirnov <anton at khirnov.net>
Date:   Tue Apr 29 16:42:07 2014 +0200

    lavc: do not use AVCodecContext.codec_name in avcodec_string()
    
    That field will be deprecated.

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 34c886e..f14d1eb 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1785,8 +1785,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
         /* fake mpeg2 transport stream codec (currently not
          * registered) */
         codec_name = "mpeg2ts";
-    } else if (enc->codec_name[0] != '\0') {
-        codec_name = enc->codec_name;
     } else {
         /* output avi tags */
         char tag_buf[32];

-- 
Libav/FFmpeg packaging