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 /libavutil/pixdesc.h | |
| 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 'libavutil/pixdesc.h')
| -rw-r--r-- | libavutil/pixdesc.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 /** |