avcodec_string: Favor AVCodecContext.codec over the default codec.

This improves output for formats with more than one AVCodec.
13 years ago · df8d5eaa14
parent b5d2bf964b
commit df8d5eaa14
1 changed files with 3 additions and 1 deletions
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@ -1498,7 +1498,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
    int bitrate;
    AVRational display_aspect_ratio;

-    if (encode)
+    if (enc->codec)
+        p = enc->codec;
+    else if (encode)
        p = avcodec_find_encoder(enc->codec_id);
    else
        p = avcodec_find_decoder(enc->codec_id);