mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'
* commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4':
dump: display codec tags when available
Conflicts:
libavcodec/utils.c
See: d2d7b7134f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
0b0d47e4b2
|
@ -2995,6 +2995,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||||
|
|
||||||
if (profile)
|
if (profile)
|
||||||
snprintf(buf + strlen(buf), buf_size - strlen(buf), " (%s)", profile);
|
snprintf(buf + strlen(buf), buf_size - strlen(buf), " (%s)", profile);
|
||||||
|
|
||||||
if (enc->codec_tag) {
|
if (enc->codec_tag) {
|
||||||
char tag_buf[32];
|
char tag_buf[32];
|
||||||
av_get_codec_tag_string(tag_buf, sizeof(tag_buf), enc->codec_tag);
|
av_get_codec_tag_string(tag_buf, sizeof(tag_buf), enc->codec_tag);
|
||||||
|
@ -3082,6 +3083,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||||
break;
|
break;
|
||||||
case AVMEDIA_TYPE_AUDIO:
|
case AVMEDIA_TYPE_AUDIO:
|
||||||
av_strlcat(buf, separator, buf_size);
|
av_strlcat(buf, separator, buf_size);
|
||||||
|
|
||||||
if (enc->sample_rate) {
|
if (enc->sample_rate) {
|
||||||
snprintf(buf + strlen(buf), buf_size - strlen(buf),
|
snprintf(buf + strlen(buf), buf_size - strlen(buf),
|
||||||
"%d Hz, ", enc->sample_rate);
|
"%d Hz, ", enc->sample_rate);
|
||||||
|
|
Loading…
Reference in New Issue