diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:44:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:44:34 +0200 |
| commit | b0edd599940491d04a49b6b4e85189460313ebd9 (patch) | |
| tree | b764f105a2f5d1fab051441e8b0bf2704d169f2b | |
| parent | 8ff23f0e3c9a6665c34c45b5635c2c149d30b264 (diff) | |
| parent | bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2 (diff) | |
| download | ffmpeg-b0edd599940491d04a49b6b4e85189460313ebd9.tar.gz | |
Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
Add missing deprecation attributes
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 5 | ||||
| -rw-r--r-- | libavutil/pixdesc.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 98217b8be5..17c48ddde1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -29,6 +29,7 @@ #include <errno.h> #include "libavutil/samplefmt.h" +#include "libavutil/attributes.h" #include "libavutil/avutil.h" #include "libavutil/buffer.h" #include "libavutil/cpu.h" @@ -1910,7 +1911,7 @@ typedef struct AVCodecContext { * - decoding: Set by user. * @deprecated Deprecated in favor of request_channel_layout. */ - int request_channels; + attribute_deprecated int request_channels; #endif /** diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6a93436826..6de0f66ae0 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -35,6 +35,7 @@ #include <stddef.h> +#include "libavutil/attributes.h" #include "libavutil/avutil.h" #include "libavutil/dict.h" #include "libavutil/frame.h" @@ -633,14 +634,14 @@ struct AVFilterContext { AVFilterPad *input_pads; ///< array of input pads AVFilterLink **inputs; ///< array of pointers to input links #if FF_API_FOO_COUNT - unsigned input_count; ///< @deprecated use nb_inputs + attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs #endif unsigned nb_inputs; ///< number of input pads AVFilterPad *output_pads; ///< array of output pads AVFilterLink **outputs; ///< array of pointers to output links #if FF_API_FOO_COUNT - unsigned output_count; ///< @deprecated use nb_outputs + attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs #endif unsigned nb_outputs; ///< number of output pads diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index f4482e81fd..b7b96b7cec 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -23,6 +23,8 @@ #define AVUTIL_PIXDESC_H #include <inttypes.h> + +#include "attributes.h" #include "pixfmt.h" typedef struct AVComponentDescriptor{ @@ -139,7 +141,7 @@ typedef struct AVPixFmtDescriptor{ /** * The array of all the pixel format descriptors. */ -extern const AVPixFmtDescriptor av_pix_fmt_descriptors[]; +extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[]; #endif /** |