diff options
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fa16c4ec1c..05f79c87a1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -263,9 +263,6 @@ enum CodecID { CODEC_ID_MP2= 0x15000, CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 CODEC_ID_AAC, -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - CODEC_ID_MPEG4AAC, -#endif CODEC_ID_AC3, CODEC_ID_DTS, CODEC_ID_VORBIS, @@ -325,12 +322,6 @@ enum CodecID { * stream (only used by libavformat) */ }; -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -/* CODEC_ID_MP3LAME is obsolete */ -#define CODEC_ID_MP3LAME CODEC_ID_MP3 -#define CODEC_ID_MPEG4AAC CODEC_ID_AAC -#endif - enum CodecType { CODEC_TYPE_UNKNOWN = -1, CODEC_TYPE_VIDEO, @@ -438,15 +429,9 @@ typedef struct RcOverride{ #define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT. #define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay. #define CODEC_FLAG_ALT_SCAN 0x00100000 ///< Use alternate scan. -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -#define CODEC_FLAG_TRELLIS_QUANT 0x00200000 ///< Use trellis quantization. -#endif #define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in extradata instead of every keyframe. #define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT). /* Fx : Flag for h263+ extra options */ -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -#define CODEC_FLAG_H263P_AIC 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction (remove this) -#endif #define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction #define CODEC_FLAG_H263P_UMV 0x02000000 ///< unlimited motion vector #define CODEC_FLAG_CBP_RD 0x04000000 ///< Use rate distortion optimization for cbp. @@ -1031,11 +1016,6 @@ typedef struct AVCodecContext { void *priv_data; -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - /* unused, FIXME remove*/ - int rtp_mode; -#endif - int rtp_payload_size; /* The size of the RTP payload: the coder will */ /* do its best to deliver a chunk with size */ /* below rtp_payload_size, the chunk will start */ @@ -1348,12 +1328,6 @@ typedef struct AVCodecContext { */ float dark_masking; - -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - /* for binary compatibility */ - int unused; -#endif - /** * IDCT algorithm, see FF_IDCT_* below. * - encoding: Set by user. @@ -1430,11 +1404,7 @@ typedef struct AVCodecContext { * - encoding: Set by libavcodec. * - decoding: Set by user. */ -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - int bits_per_sample; -#else int bits_per_coded_sample; -#endif /** * prediction method (needed for huffyuv) @@ -2373,43 +2343,6 @@ int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consum void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance); void av_resample_close(struct AVResampleContext *c); -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -/* YUV420 format is assumed ! */ - -/** - * @deprecated Use the software scaler (swscale) instead. - */ -typedef struct ImgReSampleContext ImgReSampleContext attribute_deprecated; - -/** - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated ImgReSampleContext *img_resample_init(int output_width, int output_height, - int input_width, int input_height); - -/** - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated ImgReSampleContext *img_resample_full_init(int owidth, int oheight, - int iwidth, int iheight, - int topBand, int bottomBand, - int leftBand, int rightBand, - int padtop, int padbottom, - int padleft, int padright); - -/** - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated void img_resample(struct ImgReSampleContext *s, - AVPicture *output, const AVPicture *input); - -/** - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated void img_resample_close(struct ImgReSampleContext *s); - -#endif - /** * Allocate memory for a picture. Call avpicture_free to free it. * @@ -2540,16 +2473,6 @@ void avcodec_pix_fmt_string (char *buf, int buf_size, int pix_fmt); int img_get_alpha_info(const AVPicture *src, int pix_fmt, int width, int height); -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -/** - * convert among pixel formats - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated int img_convert(AVPicture *dst, int dst_pix_fmt, - const AVPicture *src, int pix_fmt, - int width, int height); -#endif - /* deinterlace a picture */ /* deinterlace - if not supported return -1 */ int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, @@ -2557,9 +2480,6 @@ int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, /* external high level API */ -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -extern AVCodec *first_avcodec; -#endif AVCodec *av_codec_next(AVCodec *c); /** @@ -2567,11 +2487,6 @@ AVCodec *av_codec_next(AVCodec *c); */ unsigned avcodec_version(void); -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -/* returns LIBAVCODEC_BUILD constant */ -attribute_deprecated unsigned avcodec_build(void); -#endif - /** * Initializes libavcodec. * @@ -2923,9 +2838,6 @@ typedef struct AVCodecParser { struct AVCodecParser *next; } AVCodecParser; -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -extern AVCodecParser *av_first_parser; -#endif AVCodecParser *av_parser_next(AVCodecParser *c); void av_register_codec_parser(AVCodecParser *parser); @@ -2999,26 +2911,6 @@ int av_picture_crop(AVPicture *dst, const AVPicture *src, int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, int padtop, int padbottom, int padleft, int padright, int *color); -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) -/** - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated void img_copy(AVPicture *dst, const AVPicture *src, - int pix_fmt, int width, int height); - -/** - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated int img_crop(AVPicture *dst, const AVPicture *src, - int pix_fmt, int top_band, int left_band); - -/** - * @deprecated Use the software scaler (swscale) instead. - */ -attribute_deprecated int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, - int padtop, int padbottom, int padleft, int padright, int *color); -#endif - extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v); /** |