har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'cea1eef25c3310a68dd327eb74aae14ad3c2ddef'

Browse Source 
* commit 'cea1eef25c3310a68dd327eb74aae14ad3c2ddef':
  lavc: get the profile name through the codec descriptor in avcodec_string()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-01-01 16:29:28 +01:00
commit 15c60c8af2
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/utils.c
View File

@ -2669,7 +2669,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
const char *codec_type; const char *codec_type;
const char *codec_name; const char *codec_name;
const char *profile = NULL; const char *profile = NULL;
const AVCodec *p;
int64_t bitrate; int64_t bitrate;
int new_line = 0; int new_line = 0;
AVRational display_aspect_ratio; AVRational display_aspect_ratio;
@ -2679,15 +2678,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
return; return;
codec_type = av_get_media_type_string(enc->codec_type); codec_type = av_get_media_type_string(enc->codec_type);
codec_name = avcodec_get_name(enc->codec_id); codec_name = avcodec_get_name(enc->codec_id);
if (enc->profile != FF_PROFILE_UNKNOWN) { profile = avcodec_profile_name(enc->codec_id, enc->profile);
if (enc->codec)
p = enc->codec;
else
p = encode ? avcodec_find_encoder(enc->codec_id) :
avcodec_find_decoder(enc->codec_id);
if (p)
profile = av_get_profile_name(p, enc->profile);
}
snprintf(buf, buf_size, "%s: %s", codec_type ? codec_type : "unknown", snprintf(buf, buf_size, "%s: %s", codec_type ? codec_type : "unknown",
codec_name); codec_name);