virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'

Browse Source 
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-28 13:44:34 +02:00
parent 8ff23f0e3c bf4b0ed1d5
commit b0edd59994
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/avcodec.h
View File

@@ -29,6 +29,7 @@
#include <errno.h> #include <errno.h>
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#include "libavutil/attributes.h"
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
@@ -1910,7 +1911,7 @@ typedef struct AVCodecContext {
* - decoding: Set by user. * - decoding: Set by user.
* @deprecated Deprecated in favor of request_channel_layout. * @deprecated Deprecated in favor of request_channel_layout.
*/ */
int request_channels; attribute_deprecated int request_channels;
#endif #endif
/** /**

5
libavfilter/avfilter.h
View File

@@ -35,6 +35,7 @@
#include <stddef.h> #include <stddef.h>
#include "libavutil/attributes.h"
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/frame.h" #include "libavutil/frame.h"
@@ -633,14 +634,14 @@ struct AVFilterContext {
AVFilterPad *input_pads; ///< array of input pads AVFilterPad *input_pads; ///< array of input pads
AVFilterLink **inputs; ///< array of pointers to input links AVFilterLink **inputs; ///< array of pointers to input links
#if FF_API_FOO_COUNT #if FF_API_FOO_COUNT
unsigned input_count; ///< @deprecated use nb_inputs attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs
#endif #endif
unsigned nb_inputs; ///< number of input pads unsigned nb_inputs; ///< number of input pads
AVFilterPad *output_pads; ///< array of output pads AVFilterPad *output_pads; ///< array of output pads
AVFilterLink **outputs; ///< array of pointers to output links AVFilterLink **outputs; ///< array of pointers to output links
#if FF_API_FOO_COUNT #if FF_API_FOO_COUNT
unsigned output_count; ///< @deprecated use nb_outputs attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs
#endif #endif
unsigned nb_outputs; ///< number of output pads unsigned nb_outputs; ///< number of output pads

4
libavutil/pixdesc.h
View File

@@ -23,6 +23,8 @@
#define AVUTIL_PIXDESC_H #define AVUTIL_PIXDESC_H
#include <inttypes.h> #include <inttypes.h>
#include "attributes.h"
#include "pixfmt.h" #include "pixfmt.h"
typedef struct AVComponentDescriptor{ typedef struct AVComponentDescriptor{
@@ -139,7 +141,7 @@ typedef struct AVPixFmtDescriptor{
/** /**
* The array of all the pixel format descriptors. * 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 #endif
/** /**