aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2013-03-13 21:01:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-16 17:04:36 +0100
commita77f453703680fc197489730c2655c8273f23164 (patch)
tree1cbb26774995adfde6b62bc01730ba68a8e47c7d
parent07d4f557e50525d2a6cb220c7eec2d5402c9fd70 (diff)
downloadffmpeg-a77f453703680fc197489730c2655c8273f23164.tar.gz
lavfi/avcodec: deprecate remainders of the avcodec glue code
Since lavfi works natively with AVFrame now, these functions are no longer necessary and can be removed in a future bump. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/avcodec.c2
-rw-r--r--libavfilter/avcodec.h8
2 files changed, 10 insertions, 0 deletions
diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c
index 27963f5460..605e5d24d8 100644
--- a/libavfilter/avcodec.c
+++ b/libavfilter/avcodec.c
@@ -28,6 +28,7 @@
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
+#if FF_API_AVFILTERBUFFER
AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame,
int perms)
{
@@ -133,6 +134,7 @@ 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,
diff --git a/libavfilter/avcodec.h b/libavfilter/avcodec.h
index 4c660358ad..ae55df7881 100644
--- a/libavfilter/avcodec.h
+++ b/libavfilter/avcodec.h
@@ -30,12 +30,15 @@
#include "avfilter.h"
+#if FF_API_AVFILTERBUFFER
/**
* Create and return a picref reference from the data and properties
* contained in frame.
*
* @param perms permissions to assign to the new buffer reference
+ * @deprecated avfilter APIs work natively with AVFrame instead.
*/
+attribute_deprecated
AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame, int perms);
@@ -44,7 +47,9 @@ AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame
* contained in frame.
*
* @param perms permissions to assign to the new buffer reference
+ * @deprecated avfilter APIs work natively with AVFrame instead.
*/
+attribute_deprecated
AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame,
int perms);
@@ -53,10 +58,13 @@ AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame
* contained in frame.
*
* @param perms permissions to assign to the new buffer reference
+ * @deprecated avfilter APIs work natively with AVFrame instead.
*/
+attribute_deprecated
AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
const AVFrame *frame,
int perms);
+#endif
#if FF_API_FILL_FRAME
/**