lavc: remove disabled FF_API_AVCODEC_OPEN cruft.

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c8fde8d0d06b3a2e764b2b06bab8feeff1f74374..c647265459b522c9a558cb4a262f96ad9631f5bd 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3609,40 +3609,6 @@ int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, v
 int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
 //FIXME func typedef
 
-#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(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 2101df145dffd6b630f5b246a9083bb943a6b2d3..6236f79831ae58e0dfcfe05466af95d090d69b8d 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -625,13 +625,6 @@ AVFrame *avcodec_alloc_frame(void){
     return pic;
 }
 
-#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 avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
 {
     int ret = 0;

diff --git a/libavcodec/version.h b/libavcodec/version.h
index f6f1cbcaafa5ddddb2b3c325f7a3ad3e07869a8e..63a04dfa2ca538d853d24357d1d335cbe73b3723 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -41,9 +41,6 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
 #endif
-#ifndef FF_API_AVCODEC_OPEN
-#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_DRC_SCALE
 #define FF_API_DRC_SCALE        (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif