---
The ones in libavfilter add a huge number of warnings, so maybe they
are just too distracting ...
libavcodec/avcodec.h | 3 ++-
libavcodec/internal.h | 3 ++-
libavfilter/avfilter.h | 6 ++++--
libavformat/avformat.h | 11 ++++++-----
libavutil/lls.c | 2 +-
libavutil/pixdesc.h | 4 +++-
libswscale/swscale.h | 2 ++
7 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7a24775..f4c82f2 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -28,6 +28,7 @@
#include <errno.h>
#include "libavutil/samplefmt.h"
+#include "libavutil/attributes.h"
#include "libavutil/avutil.h"
#include "libavutil/cpu.h"
#include "libavutil/dict.h"
@@ -2163,7 +2164,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/libavcodec/internal.h b/libavcodec/internal.h
index 069a855..f40a975 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -26,6 +26,7 @@
#include <stdint.h>
+#include "libavutil/attributes.h"
#include "libavutil/mathematics.h"
#include "libavutil/pixfmt.h"
#include "avcodec.h"
@@ -67,7 +68,7 @@ typedef struct AVCodecInternal {
* Internal sample count used by avcodec_encode_audio() to fabricate pts.
* Can be removed along with avcodec_encode_audio().
*/
- int sample_count;
+ attribute_deprecated int sample_count;
#endif
/**
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index c5f8d56..574a5bd 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -22,6 +22,7 @@
#ifndef AVFILTER_AVFILTER_H
#define AVFILTER_AVFILTER_H
+#include "libavutil/attributes.h"
#include "libavutil/avutil.h"
#include "libavutil/log.h"
#include "libavutil/samplefmt.h"
@@ -59,6 +60,7 @@ typedef struct AVFilterFormats AVFilterFormats;
* should not store pointers to this structure directly, but instead use the
* AVFilterBufferRef structure below.
*/
+attribute_deprecated
typedef struct AVFilterBuffer {
uint8_t *data[8]; ///< buffer data for each plane/channel
@@ -425,14 +427,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/libavformat/avformat.h b/libavformat/avformat.h
index 149b66f..db62eff 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -201,6 +201,7 @@
#include <time.h>
#include <stdio.h> /* FILE */
#include "libavcodec/avcodec.h"
+#include "libavutil/attributes.h"
#include "libavutil/dict.h"
#include "libavutil/log.h"
@@ -645,7 +646,7 @@ typedef struct AVStream {
* For example, if the time base is 1/90000 and all frames have either
* approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
*/
- AVRational r_frame_rate;
+ attribute_deprecated AVRational r_frame_rate;
#endif
void *priv_data;
@@ -723,10 +724,10 @@ typedef struct AVStream {
#define MAX_STD_TIMEBASES (60*12+5)
struct {
#if FF_API_R_FRAME_RATE
- int64_t last_dts;
- int64_t duration_gcd;
- int duration_count;
- double duration_error[MAX_STD_TIMEBASES];
+ attribute_deprecated int64_t last_dts;
+ attribute_deprecated int64_t duration_gcd;
+ attribute_deprecated int duration_count;
+ attribute_deprecated double duration_error[MAX_STD_TIMEBASES];
#endif
int nb_decoded_frames;
int found_decoder;
diff --git a/libavutil/lls.c b/libavutil/lls.c
index a26b3c2..3daa3cc 100644
--- a/libavutil/lls.c
+++ b/libavutil/lls.c
@@ -116,7 +116,7 @@ double avpriv_evaluate_lls(LLSModel *m, double *param, int
order)
return out;
}
-#ifndef FF_API_LLS_PRIVATE
+#if FF_API_LLS_PRIVATE
void av_init_lls(LLSModel *m, int indep_count)
{
return avpriv_init_lls(m, indep_count);
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index 47e6bb8..e5848e9 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{
@@ -103,7 +105,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
/**
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 8ba09e6..fa1261d 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -29,6 +29,7 @@
#include <stdint.h>
+#include "libavutil/attributes.h"
#include "libavutil/avutil.h"
#include "libavutil/log.h"
#include "libavutil/pixfmt.h"
@@ -178,6 +179,7 @@ void sws_freeContext(struct SwsContext *swsContext);
* written
* @deprecated Use sws_getCachedContext() instead.
*/
+attribute_deprecated
struct SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat
srcFormat,
int dstW, int dstH, enum AVPixelFormat
dstFormat,
int flags, SwsFilter *srcFilter,
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
