[FFmpeg-cvslog] ffprobe: use the codec descriptor if no decoder was found.

Nicolas George git at videolan.org
Tue Apr 29 19:43:50 CEST 2014


ffmpeg | branch: master | Nicolas George <george at nsup.org> | Thu Apr 17 00:22:14 2014 +0200| [43ca94a6337389d82099f68a31bc19cde61d176d] | committer: Nicolas George

ffprobe: use the codec descriptor if no decoder was found.

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

 ffprobe.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ffprobe.c b/ffprobe.c
index 319bbc6..c6e0469 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1976,6 +1976,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
     const char *s;
     AVRational sar, dar;
     AVBPrint pbuf;
+    const AVCodecDescriptor *cd;
     int ret = 0;
 
     av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
@@ -1993,6 +1994,12 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
                 if (dec->long_name) print_str    ("codec_long_name", dec->long_name);
                 else                print_str_opt("codec_long_name", "unknown");
             }
+        } else if ((cd = avcodec_descriptor_get(stream->codec->codec_id))) {
+            print_str_opt("codec_name", cd->name);
+            if (!do_bitexact) {
+                print_str_opt("codec_long_name",
+                              cd->long_name ? cd->long_name : "unknown");
+            }
         } else {
             print_str_opt("codec_name", "unknown");
             if (!do_bitexact) {



More information about the ffmpeg-cvslog mailing list