RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

core: make more robust against missing libavcodec AVCodecDescriptor entries 

Missing entries cause avcodec_descriptor_get() to return NULL, and in
turn mp_codec_from_av_codec_id() will return NULL. This shouldn't
happen, and avcodec_descriptor_get() returning NULL for a valid codec is
clearly a bug.

But make it more robust anyway, and use the decoder's name if this
happens, because I doubt maintainance of the AVCodecDescriptor table
in ffmpeg/Libav will always be perfect and reliable.
This commit is contained in:
wm4 2013-03-07 23:37:06 +01:00
parent fe4213b164
commit 14427ae2ee
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/av_common.c
View File

@ -90,15 +90,30 @@ void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type)
int mp_codec_to_av_codec_id(const char *codec) int mp_codec_to_av_codec_id(const char *codec)
{ {
int id = CODEC_ID_NONE;
const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec); const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name(codec);
return desc ? desc->id : CODEC_ID_NONE; if (desc)
id = desc->id;
if (id == CODEC_ID_NONE) {
AVCodec *avcodec = avcodec_find_decoder_by_name(codec);
if (avcodec)
id = avcodec->id;
}
return id;
} }
const char *mp_codec_from_av_codec_id(int codec_id) const char *mp_codec_from_av_codec_id(int codec_id)
{ {
const char *name = NULL;
const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id);
return desc ? desc->name : NULL; if (desc)
name = desc->name;
if (!name) {
AVCodec *avcodec = avcodec_find_decoder(codec_id);
if (avcodec)
name = avcodec->name;
}
return name;
} }
#else #else