diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-09-26 18:42:50 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-09-28 10:50:38 +0200 |
| commit | a5d58fea68b9212e0065a71939e921505504a9bb (patch) | |
| tree | aa6b964ddca049ecfdd636523036cdfb91babb2d | |
| parent | b10b6ac7a902f28e09e37a29c392e2f0c19e9526 (diff) | |
| download | ffmpeg-a5d58fea68b9212e0065a71939e921505504a9bb.tar.gz | |
lavc: reimplement avcodec_get_type() using codec descriptors
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/codec_desc.c | 6 | ||||
| -rw-r--r-- | libavcodec/utils.c | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index c1be40bd85..31d3555c25 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2435,3 +2435,9 @@ const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name) return desc; return NULL; } + +enum AVMediaType avcodec_get_type(enum AVCodecID codec_id) +{ + const AVCodecDescriptor *desc = avcodec_descriptor_get(codec_id); + return desc ? desc->type : AVMEDIA_TYPE_UNKNOWN; +} diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a94e4a6058..1721c09129 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2320,20 +2320,6 @@ void ff_thread_await_progress(ThreadFrame *f, int progress, int field) #endif -enum AVMediaType avcodec_get_type(enum AVCodecID codec_id) -{ - if (codec_id <= AV_CODEC_ID_NONE) - return AVMEDIA_TYPE_UNKNOWN; - else if (codec_id < AV_CODEC_ID_FIRST_AUDIO) - return AVMEDIA_TYPE_VIDEO; - else if (codec_id < AV_CODEC_ID_FIRST_SUBTITLE) - return AVMEDIA_TYPE_AUDIO; - else if (codec_id < AV_CODEC_ID_FIRST_UNKNOWN) - return AVMEDIA_TYPE_SUBTITLE; - - return AVMEDIA_TYPE_UNKNOWN; -} - int avcodec_is_open(AVCodecContext *s) { return !!s->internal; |