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 /libavfilter | |
| 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>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 |