diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:45:19 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:45:19 +0200 |
| commit | 2f63e83c26f15f5754c87bfbb9f101cd9a2a4b98 (patch) | |
| tree | a4d52100c23e2575b1cabe222b2ea3732b901a58 /libavcodec/utils.c | |
| parent | b123d82c4182fc3842376ac1e078ec63bcd2e20c (diff) | |
| parent | a5d58fea68b9212e0065a71939e921505504a9bb (diff) | |
| download | ffmpeg-streaming-2f63e83c26f15f5754c87bfbb9f101cd9a2a4b98.zip ffmpeg-streaming-2f63e83c26f15f5754c87bfbb9f101cd9a2a4b98.tar.gz | |
Merge commit 'a5d58fea68b9212e0065a71939e921505504a9bb'
* commit 'a5d58fea68b9212e0065a71939e921505504a9bb':
lavc: reimplement avcodec_get_type() using codec descriptors
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 19548e2..c2ded45 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3403,26 +3403,6 @@ void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, in #endif -enum AVMediaType avcodec_get_type(enum AVCodecID codec_id) -{ - AVCodec *c= avcodec_find_decoder(codec_id); - if(!c) - c= avcodec_find_encoder(codec_id); - if(c) - return c->type; - - 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; |
