diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:34 +0100 |
commit | ec104eef51d16974f7d90dfb2ab705df3f47e6bb (patch) | |
tree | 1d37fd5382f210af8187ce884e95eb49a05ecc34 /libavcodec/options.c | |
parent | 8e5746d46102d7ae3137cfd881e2974b4fca0c89 (diff) | |
download | ffmpeg-ec104eef51d16974f7d90dfb2ab705df3f47e6bb.tar.gz |
lavc: remove disabled FF_API_ALLOC_CONTEXT cruft.
Diffstat (limited to 'libavcodec/options.c')
-rw-r--r-- | libavcodec/options.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 703563c284..5024829b82 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -451,13 +451,6 @@ static const AVClass av_codec_context_class = { .child_class_next = codec_child_class_next, }; -#if FF_API_ALLOC_CONTEXT -void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){ - avcodec_get_context_defaults3(s, NULL); - s->codec_type = codec_type; -} -#endif - int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){ memset(s, 0, sizeof(AVCodecContext)); @@ -515,26 +508,6 @@ AVCodecContext *avcodec_alloc_context3(AVCodec *codec){ return avctx; } -#if FF_API_ALLOC_CONTEXT -AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){ - AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); - - if(avctx==NULL) return NULL; - - avcodec_get_context_defaults2(avctx, codec_type); - - return avctx; -} - -void avcodec_get_context_defaults(AVCodecContext *s){ - avcodec_get_context_defaults2(s, AVMEDIA_TYPE_UNKNOWN); -} - -AVCodecContext *avcodec_alloc_context(void){ - return avcodec_alloc_context2(AVMEDIA_TYPE_UNKNOWN); -} -#endif - int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) { if (dest->codec) { // check that the dest context is uninitialized |