From fffc9a077d39e4776665f10129c33bfbf1a86c29 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sun, 14 Sep 2014 21:31:12 -0300
Subject: [PATCH] avfilter: remove obsolete FF_API_FILL_FRAME cruft
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavfilter/avcodec.c | 20 --------------------
libavfilter/avcodec.h | 41 -----------------------------------------
libavfilter/version.h | 3 ---
3 files changed, 64 deletions(-)
diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c
index ba11a254925..e0d90154ee5 100644
--- a/libavfilter/avcodec.c
+++ b/libavfilter/avcodec.c
@@ -135,23 +135,3 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src)
return 0;
}
#endif
-
-#if FF_API_FILL_FRAME
-int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
- const AVFilterBufferRef *samplesref)
-{
- return avfilter_copy_buf_props(frame, samplesref);
-}
-
-int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
- const AVFilterBufferRef *picref)
-{
- return avfilter_copy_buf_props(frame, picref);
-}
-
-int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
- const AVFilterBufferRef *ref)
-{
- return avfilter_copy_buf_props(frame, ref);
-}
-#endif
diff --git a/libavfilter/avcodec.h b/libavfilter/avcodec.h
index 8bbdad267fb..d3d0e20e712 100644
--- a/libavfilter/avcodec.h
+++ b/libavfilter/avcodec.h
@@ -66,45 +66,4 @@ AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
int perms);
#endif
-#if FF_API_FILL_FRAME
-/**
- * Fill an AVFrame with the information stored in samplesref.
- *
- * @param frame an already allocated AVFrame
- * @param samplesref an audio buffer reference
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- * @deprecated Use avfilter_copy_buf_props() instead.
- */
-attribute_deprecated
-int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
- const AVFilterBufferRef *samplesref);
-
-/**
- * Fill an AVFrame with the information stored in picref.
- *
- * @param frame an already allocated AVFrame
- * @param picref a video buffer reference
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- * @deprecated Use avfilter_copy_buf_props() instead.
- */
-attribute_deprecated
-int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
- const AVFilterBufferRef *picref);
-
-/**
- * Fill an AVFrame with information stored in ref.
- *
- * @param frame an already allocated AVFrame
- * @param ref a video or audio buffer reference
- * @return >= 0 in case of success, a negative AVERROR code in case of
- * failure
- * @deprecated Use avfilter_copy_buf_props() instead.
- */
-attribute_deprecated
-int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
- const AVFilterBufferRef *ref);
-#endif
-
#endif /* AVFILTER_AVCODEC_H */
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 7be5eeb3b4a..a251cb1c2ed 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -55,9 +55,6 @@
#ifndef FF_API_FOO_COUNT
#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 6)
#endif
-#ifndef FF_API_FILL_FRAME
-#define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
#ifndef FF_API_AVFILTERBUFFER
#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 6)
#endif
--
GitLab