virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavc: get the profile name through the codec descriptor in avcodec_string()

Browse Source
This commit is contained in:
Anton Khirnov 2015-01-01 14:58:05 +01:00
parent 2c6811397b
commit cea1eef25c
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/utils.c
View File

@ -1749,25 +1749,15 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
{ {
const char *codec_name; const char *codec_name;
const char *profile = NULL; const char *profile = NULL;
const AVCodec *p;
char buf1[32]; char buf1[32];
int bitrate; int bitrate;
int new_line = 0; int new_line = 0;
AVRational display_aspect_ratio; AVRational display_aspect_ratio;
const AVCodecDescriptor *desc = avcodec_descriptor_get(enc->codec_id); const AVCodecDescriptor *desc = avcodec_descriptor_get(enc->codec_id);
if (enc->codec)
p = enc->codec;
else if (encode)
p = avcodec_find_encoder(enc->codec_id);
else
p = avcodec_find_decoder(enc->codec_id);
if (p)
profile = av_get_profile_name(p, enc->profile);
if (desc) { if (desc) {
codec_name = desc->name; codec_name = desc->name;
profile = avcodec_profile_name(enc->codec_id, enc->profile);
} else if (enc->codec_id == AV_CODEC_ID_MPEG2TS) { } else if (enc->codec_id == AV_CODEC_ID_MPEG2TS) {
/* fake mpeg2 transport stream codec (currently not /* fake mpeg2 transport stream codec (currently not
* registered) */ * registered) */