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

This commit is contained in:
Nicolas George 2014-04-17 00:22:14 +02:00
parent c9212abf95
commit 43ca94a633

View File

@ -1976,6 +1976,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
const char *s; const char *s;
AVRational sar, dar; AVRational sar, dar;
AVBPrint pbuf; AVBPrint pbuf;
const AVCodecDescriptor *cd;
int ret = 0; int ret = 0;
av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); 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); if (dec->long_name) print_str ("codec_long_name", dec->long_name);
else print_str_opt("codec_long_name", "unknown"); 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 { } else {
print_str_opt("codec_name", "unknown"); print_str_opt("codec_name", "unknown");
if (!do_bitexact) { if (!do_bitexact) {