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/avcodec.h | |
parent | 8e5746d46102d7ae3137cfd881e2974b4fca0c89 (diff) | |
download | ffmpeg-ec104eef51d16974f7d90dfb2ab705df3f47e6bb.tar.gz |
lavc: remove disabled FF_API_ALLOC_CONTEXT cruft.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 95458fa3e0..c8fde8d0d0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3516,22 +3516,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); */ const char *av_get_profile_name(const AVCodec *codec, int profile); -#if FF_API_ALLOC_CONTEXT -/** - * 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 - /** * Set the fields of the given AVCodecContext to default values corresponding * to the given codec (defaults may be codec-dependent). @@ -3543,25 +3527,6 @@ void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType); */ int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec); -#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); -#endif - /** * Allocate an AVCodecContext and set its fields to default values. The * resulting struct can be deallocated by simply calling av_free(). |