Commit bb6effe0 authored by Stefano Sabatini's avatar Stefano Sabatini

lavfi: remove vsrc_buffer.h API

The vsrc_buffer.h is not installed since commit 0b3b9581, so there is
no point into keeping it around.

The buffersrc.h API, which is more powerful, should be used instead.
parent ab7dbdc9
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "libavcodec/avcodec.h" // AVFrame #include "libavcodec/avcodec.h" // AVFrame
#include "avfilter.h" #include "avfilter.h"
#include "vsrc_buffer.h"
/** /**
* Copy the frame properties of src to dst, without copying the actual * Copy the frame properties of src to dst, without copying the actual
...@@ -119,15 +118,4 @@ int avfilter_fill_frame_from_buffer_ref(AVFrame *frame, ...@@ -119,15 +118,4 @@ int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
int av_buffersrc_add_frame(AVFilterContext *buffer_src, int av_buffersrc_add_frame(AVFilterContext *buffer_src,
const AVFrame *frame, int flags); const AVFrame *frame, int flags);
/**
* Add frame data to buffer_src.
*
* @param buffer_src pointer to a buffer source context
* @param flags a combination of AV_VSRC_BUF_FLAG_* flags
* @return >= 0 in case of success, a negative AVERROR code in case of
* failure
*/
int av_vsrc_buffer_add_frame(AVFilterContext *buffer_src,
const AVFrame *frame, int flags);
#endif /* AVFILTER_AVCODEC_H */ #endif /* AVFILTER_AVCODEC_H */
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "audio.h" #include "audio.h"
#include "avcodec.h" #include "avcodec.h"
#include "buffersrc.h" #include "buffersrc.h"
#include "vsrc_buffer.h"
#include "asrc_abuffer.h" #include "asrc_abuffer.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
...@@ -67,27 +66,6 @@ static void buf_free(AVFilterBuffer *ptr) ...@@ -67,27 +66,6 @@ static void buf_free(AVFilterBuffer *ptr)
return; return;
} }
int av_vsrc_buffer_add_video_buffer_ref(AVFilterContext *buffer_filter,
AVFilterBufferRef *picref, int flags)
{
return av_buffersrc_add_ref(buffer_filter, picref, 0);
}
#if CONFIG_AVCODEC
#include "avcodec.h"
int av_vsrc_buffer_add_frame(AVFilterContext *buffer_src,
const AVFrame *frame, int flags)
{
return av_buffersrc_add_frame(buffer_src, frame, 0);
}
#endif
unsigned av_vsrc_buffer_get_nb_failed_requests(AVFilterContext *buffer_src)
{
return ((BufferSourceContext *)buffer_src->priv)->nb_failed_requests;
}
int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *ctx, int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *ctx,
AVFilterBufferRef *samplesref, AVFilterBufferRef *samplesref,
int av_unused flags) int av_unused flags)
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 0 #define LIBAVFILTER_VERSION_MINOR 0
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \
......
/*
* Copyright (c) 2008 Vitor Sessak
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVFILTER_VSRC_BUFFER_H
#define AVFILTER_VSRC_BUFFER_H
/**
* @file
* memory buffer source API for video
*
* @deprecated use buffersrc.h instead.
*/
#include "avfilter.h"
/**
* Tell av_vsrc_buffer_add_video_buffer_ref() to overwrite the already
* cached video buffer with the new added one, otherwise the function
* will complain and exit.
*/
#define AV_VSRC_BUF_FLAG_OVERWRITE 1
/**
* Add video buffer data in picref to buffer_src.
*
* @param buffer_src pointer to a buffer source context
* @param flags a combination of AV_VSRC_BUF_FLAG_* flags
* @return >= 0 in case of success, a negative AVERROR code in case of
* failure
*
* @deprecated use av_buffersrc_add_ref() instead.
*/
attribute_deprecated
int av_vsrc_buffer_add_video_buffer_ref(AVFilterContext *buffer_src,
AVFilterBufferRef *picref, int flags);
/**
* Get the number of failed requests.
*
* A failed request is when the request_frame method is called while no
* frame is present in the buffer.
* The number is reset when a frame is added.
*
* @deprecated use av_buffersrc_get_nb_failed_requests() instead.
*/
attribute_deprecated
unsigned av_vsrc_buffer_get_nb_failed_requests(AVFilterContext *buffer_src);
#endif /* AVFILTER_VSRC_BUFFER_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment