diff options
author | Stefano Sabatini | 2013-11-03 13:32:34 +0100 |
---|---|---|
committer | Stefano Sabatini | 2013-11-03 17:58:44 +0100 |
commit | d3397c3e829b2dc38fb7e4502784bf06fa38983e (patch) | |
tree | 6946ffd98781611288b1a073d9e90e8efb955518 | |
parent | 3d9fc5c6ad31634aaf0f1621ddaa0b83b49fcb36 (diff) |
lavc: remove dead FF_API_ALLOC_CONTEXT API
-rw-r--r-- | libavcodec/avcodec.h | 34 | ||||
-rw-r--r-- | libavcodec/options.c | 28 | ||||
-rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 65 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index df52b789be..04af38730f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3265,40 +3265,6 @@ void avcodec_register(AVCodec *codec); */ void avcodec_register_all(void); - -#if FF_API_ALLOC_CONTEXT -/** - * Allocate an AVCodecContext and set its fields to default values. The - * resulting struct can be deallocated by simply calling av_free(). - * - * @return An AVCodecContext filled with default values or NULL on failure. - * @see avcodec_get_context_defaults - * - * @deprecated use avcodec_alloc_context3() - */ -attribute_deprecated -AVCodecContext *avcodec_alloc_context(void); - -/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API! - * we WILL change its arguments and name a few times! */ -attribute_deprecated -AVCodecContext *avcodec_alloc_context2(enum AVMediaType); - -/** - * Set the fields of the given AVCodecContext to default values. - * - * @param s The AVCodecContext of which the fields should be set to default values. - * @deprecated use avcodec_get_context_defaults3 - */ -attribute_deprecated -void avcodec_get_context_defaults(AVCodecContext *s); - -/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API! - * we WILL change its arguments and name a few times! */ -attribute_deprecated -void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType); -#endif - /** * Allocate an AVCodecContext and set its fields to default values. The * resulting struct can be deallocated by calling avcodec_close() on it followed diff --git a/libavcodec/options.c b/libavcodec/options.c index 02fb89f5cb..266a7f1297 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -86,14 +86,6 @@ static const AVClass av_codec_context_class = { .get_category = get_category, }; -#if FF_API_ALLOC_CONTEXT -void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType codec_type){ - AVCodec c= {0}; - c.type= codec_type; - avcodec_get_context_defaults3(s, &c); -} -#endif - int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec) { int flags=0; @@ -162,26 +154,6 @@ AVCodecContext *avcodec_alloc_context3(const 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 (avcodec_is_open(dest)) { // check that the dest context is uninitialized diff --git a/libavcodec/version.h b/libavcodec/version.h index 16552db901..898307529c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -51,9 +51,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_ALLOC_CONTEXT -#define FF_API_ALLOC_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_AVCODEC_OPEN #define FF_API_AVCODEC_OPEN (LIBAVCODEC_VERSION_MAJOR < 55) #endif |