diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 13:56:42 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 13:38:34 +0400 |
commit | d2d931500b24900dcff2527b94ce0dfc36f9d6f2 (patch) | |
tree | 43c076f004788daa4bf66740cb275a00d1fa8799 /libavcodec/avcodec.h | |
parent | ec104eef51d16974f7d90dfb2ab705df3f47e6bb (diff) |
lavc: remove disabled FF_API_AVCODEC_OPEN cruft.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c8fde8d0d0..c647265459 100644 --- 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(). |