From: Nicolas George Date: Wed, 16 Apr 2014 22:22:14 +0000 (+0200) Subject: ffprobe: use the codec descriptor if no decoder was found. X-Git-Tag: n2.3~1458^2~6 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=43ca94a6337389d82099f68a31bc19cde61d176d ffprobe: use the codec descriptor if no decoder was found. --- diff --git a/ffprobe.c b/ffprobe.c index 319bbc65c8..c6e0469d18 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) {