[FFmpeg-devel] [PATCH 06/10] asrc_abuffer: deprecate av_asrc_buffer_* functions.

[Nicolas George]

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavfilter/asrc_abuffer.h |    9 +++++++++
 libavfilter/src_buffer.c   |    4 ++++
 2 files changed, 13 insertions(+)


Putting attribute_deprecated in the previous line makes the patch more
readable, and avoids overly long lines and broken indent.


diff --git a/libavfilter/asrc_abuffer.h b/libavfilter/asrc_abuffer.h
index 4352c74..ebf55fd 100644
--- a/libavfilter/asrc_abuffer.h
+++ b/libavfilter/asrc_abuffer.h
@@ -38,7 +38,10 @@
  * @param planar flag to indicate if audio data is planar or packed
  * @param pts presentation timestamp of the audio buffer
  * @param flags unused
+ *
+ * @deprecated use av_buffersrc_add_ref() instead.
  */
+attribute_deprecated
 int av_asrc_buffer_add_samples(AVFilterContext *abuffersrc,
                                uint8_t *data[8], int linesize[8],
                                int nb_samples, int sample_rate,
@@ -59,7 +62,10 @@ int av_asrc_buffer_add_samples(AVFilterContext *abuffersrc,
  * @param ch_layout channel layout of the audio data
  * @param pts presentation timestamp of the audio buffer
  * @param flags unused
+ *
+ * @deprecated use av_buffersrc_add_ref() instead.
  */
+attribute_deprecated
 int av_asrc_buffer_add_buffer(AVFilterContext *abuffersrc,
                               uint8_t *buf, int buf_size,
                               int sample_rate,
@@ -72,7 +78,10 @@ int av_asrc_buffer_add_buffer(AVFilterContext *abuffersrc,
  * @param abuffersrc audio source buffer context
  * @param samplesref buffer ref to queue
  * @param flags unused
+ *
+ * @deprecated use av_buffersrc_add_ref() instead.
  */
+attribute_deprecated
 int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *abuffersrc,
                                         AVFilterBufferRef *samplesref,
                                         int av_unused flags);
diff --git a/libavfilter/src_buffer.c b/libavfilter/src_buffer.c
index c6929f6..f247f2c 100644
--- a/libavfilter/src_buffer.c
+++ b/libavfilter/src_buffer.c
@@ -607,7 +607,9 @@ int av_asrc_buffer_add_samples(AVFilterContext *ctx,
     samplesref->pts = pts;
     samplesref->audio->sample_rate = sample_rate;
 
+    AV_NOWARN_DEPRECATED(
     return av_asrc_buffer_add_audio_buffer_ref(ctx, samplesref, 0);
+    )
 }
 
 int av_asrc_buffer_add_buffer(AVFilterContext *ctx,
@@ -624,11 +626,13 @@ int av_asrc_buffer_add_buffer(AVFilterContext *ctx,
                            buf, nb_channels, nb_samples,
                            sample_fmt, 16);
 
+    AV_NOWARN_DEPRECATED(
     return av_asrc_buffer_add_samples(ctx,
                                       data, linesize, nb_samples,
                                       sample_rate,
                                       sample_fmt, channel_layout, planar,
                                       pts, flags);
+    )
 }
 
 AVFilter avfilter_vsrc_buffer = {
-- 
1.7.10