diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-11-03 13:34:08 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-11-03 17:58:44 +0100 |
| commit | a68956042818d92cad63dd37771183028cfed9fc (patch) | |
| tree | 47b205a9854c03b73e9809584ae388ba6bab3145 /libavcodec | |
| parent | d3397c3e829b2dc38fb7e4502784bf06fa38983e (diff) | |
lavc: remove dead FF_API_AVCODEC_OPEN API
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 34 | ||||
| -rw-r--r-- | libavcodec/utils.c | 7 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 44 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 04af38730f..285d2659ce 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3358,40 +3358,6 @@ void avcodec_get_frame_defaults(AVFrame *frame); */ void avcodec_free_frame(AVFrame **frame); -#if FF_API_AVCODEC_OPEN -/** - * Initialize the AVCodecContext to use the given AVCodec. Prior to using this - * function the context has to be allocated. - * - * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(), - * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for - * retrieving a codec. - * - * @warning This function is not thread safe! - * - * @code - * avcodec_register_all(); - * codec = avcodec_find_decoder(AV_CODEC_ID_H264); - * if (!codec) - * exit(1); - * - * context = avcodec_alloc_context3(codec); - * - * if (avcodec_open(context, codec) < 0) - * exit(1); - * @endcode - * - * @param avctx The context which will be set up to use the given codec. - * @param codec The codec to use within the context. - * @return zero on success, a negative value on error - * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close - * - * @deprecated use avcodec_open2 - */ -attribute_deprecated -int avcodec_open(AVCodecContext *avctx, AVCodec *codec); -#endif - /** * Initialize the AVCodecContext to use the given AVCodec. Prior to using this * function the context has to be allocated with avcodec_alloc_context3(). diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2ab8e70265..97ab615d90 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1149,13 +1149,6 @@ static int get_bit_rate(AVCodecContext *ctx) return bit_rate; } -#if FF_API_AVCODEC_OPEN -int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) -{ - return avcodec_open2(avctx, codec, NULL); -} -#endif - int attribute_align_arg ff_codec_open2_recursive(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) { int ret = 0; diff --git a/libavcodec/version.h b/libavcodec/version.h index 898307529c..3525c19d4c 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_AVCODEC_OPEN -#define FF_API_AVCODEC_OPEN (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_OLD_DECODE_AUDIO #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56) #endif |