From 955ab9a4d889b359a8dbde0131e5d355f329e664 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 20 Aug 2006 10:42:11 +0000 Subject: [PATCH] attribute_deprecated Originally committed as revision 6033 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 22 +++++++++++----------- libavutil/common.h | 8 ++++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 3645fafece..3f834a424d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -79,7 +79,7 @@ static inline void av_free_packet(AVPacket *pkt) is assumed to be such as 0 <= num < den */ typedef struct AVFrac { int64_t val, num, den; -} AVFrac; +} AVFrac attribute_deprecated; /*************************************************/ /* input/output formats */ @@ -351,8 +351,8 @@ extern AVInputFormat *first_iformat; extern AVOutputFormat *first_oformat; /* still image support */ -struct AVInputImageContext; -typedef struct AVInputImageContext AVInputImageContext; +struct AVInputImageContext attribute_deprecated; +typedef struct AVInputImageContext AVInputImageContext attribute_deprecated; typedef struct AVImageInfo { enum PixelFormat pix_fmt; /* requested pixel format */ @@ -360,7 +360,7 @@ typedef struct AVImageInfo { int height; /* requested height */ int interleaved; /* image is interleaved (e.g. interleaved GIF) */ AVPicture pict; /* returned allocated image */ -} AVImageInfo; +} AVImageInfo attribute_deprecated; /* AVImageFormat.flags field constants */ #define AVIMAGE_INTERLEAVED 0x0001 /* image format support interleaved output */ @@ -381,18 +381,18 @@ typedef struct AVImageFormat { int (*img_write)(ByteIOContext *, AVImageInfo *); int flags; struct AVImageFormat *next; -} AVImageFormat; +} AVImageFormat attribute_deprecated; -void av_register_image_format(AVImageFormat *img_fmt); -AVImageFormat *av_probe_image_format(AVProbeData *pd); -AVImageFormat *guess_image_format(const char *filename); +void av_register_image_format(AVImageFormat *img_fmt) attribute_deprecated; +AVImageFormat *av_probe_image_format(AVProbeData *pd) attribute_deprecated; +AVImageFormat *guess_image_format(const char *filename) attribute_deprecated; enum CodecID av_guess_image2_codec(const char *filename); int av_read_image(ByteIOContext *pb, const char *filename, AVImageFormat *fmt, - int (*alloc_cb)(void *, AVImageInfo *info), void *opaque); -int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img); + int (*alloc_cb)(void *, AVImageInfo *info), void *opaque) attribute_deprecated; +int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img) attribute_deprecated; -extern AVImageFormat *first_image_format; +extern AVImageFormat *first_image_format attribute_deprecated; /* XXX: use automatic init with either ELF sections or C file parser */ /* modules */ diff --git a/libavutil/common.h b/libavutil/common.h index be665a9874..60ea46a83d 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -56,6 +56,14 @@ #endif #endif +#ifndef attribute_deprecated +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define attribute_deprecated __attribute__((deprecated)) +#else +# define attribute_deprecated +#endif +#endif + #ifndef EMULATE_INTTYPES # include #else