[FFmpeg-cvslog] lavc: print the name of the codec, not its implementation, in avcodec_string

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Dec 30 12:44:02 2014 +0100| [cdc9ce098e8d101b43b8f68dd35ba7226f4a728c] | committer: Anton Khirnov

lavc: print the name of the codec, not its implementation, in avcodec_string

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

 libavcodec/utils.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4f2f951..af2835e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1754,6 +1754,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
     int bitrate;
     int new_line = 0;
     AVRational display_aspect_ratio;
+    const AVCodecDescriptor *desc = avcodec_descriptor_get(enc->codec_id);
 
     if (enc->codec)
         p = enc->codec;
@@ -1762,9 +1763,11 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
     else
         p = avcodec_find_decoder(enc->codec_id);
 
-    if (p) {
-        codec_name = p->name;
+    if (p)
         profile = av_get_profile_name(p, enc->profile);
+
+    if (desc) {
+        codec_name = desc->name;
     } else if (enc->codec_id == AV_CODEC_ID_MPEG2TS) {
         /* fake mpeg2 transport stream codec (currently not
          * registered) */