diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-06-17 12:36:52 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-06-26 13:15:26 +0200 |
commit | 0b3b95813576aeafc64813c93c6387b24e210f9a (patch) | |
tree | 49eececc608c53c5f7417acf1e22ab981e3b43f2 | |
parent | 6c1e065bd4a20f6bcac14667ae11d7ffee1551d9 (diff) | |
download | ffmpeg-0b3b95813576aeafc64813c93c6387b24e210f9a.tar.gz |
lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
-rw-r--r-- | libavfilter/Makefile | 1 | ||||
-rw-r--r-- | libavfilter/buffersrc.c | 20 | ||||
-rw-r--r-- | libavfilter/version.h | 3 | ||||
-rw-r--r-- | libavfilter/vsrc_buffer.h | 37 |
4 files changed, 0 insertions, 61 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c77d450d7e..b78960932f 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -10,7 +10,6 @@ HEADERS = avfilter.h \ buffersink.h \ buffersrc.h \ version.h \ - vsrc_buffer.h \ OBJS = allfilters.o \ audio.o \ diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 30e34b75fa..e1311c022a 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -29,7 +29,6 @@ #include "formats.h" #include "internal.h" #include "video.h" -#include "vsrc_buffer.h" #include "libavutil/audioconvert.h" #include "libavutil/fifo.h" @@ -70,25 +69,6 @@ typedef struct { return AVERROR(EINVAL);\ } -#if FF_API_VSRC_BUFFER_ADD_FRAME -int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, - int64_t pts, AVRational pixel_aspect) -{ - int64_t orig_pts = frame->pts; - AVRational orig_sar = frame->sample_aspect_ratio; - int ret; - - frame->pts = pts; - frame->sample_aspect_ratio = pixel_aspect; - if ((ret = av_buffersrc_write_frame(buffer_filter, frame)) < 0) - return ret; - frame->pts = orig_pts; - frame->sample_aspect_ratio = orig_sar; - - return 0; -} -#endif - int av_buffersrc_write_frame(AVFilterContext *buffer_filter, AVFrame *frame) { BufferSourceContext *c = buffer_filter->priv; diff --git a/libavfilter/version.h b/libavfilter/version.h index 472643bc79..d61d11173e 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -44,9 +44,6 @@ * Those FF_API_* defines are not part of public API. * They may change, break or disappear at any time. */ -#ifndef FF_API_VSRC_BUFFER_ADD_FRAME -#define FF_API_VSRC_BUFFER_ADD_FRAME (LIBAVFILTER_VERSION_MAJOR < 3) -#endif #ifndef FF_API_DEFAULT_CONFIG_OUTPUT_LINK #define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3) #endif diff --git a/libavfilter/vsrc_buffer.h b/libavfilter/vsrc_buffer.h deleted file mode 100644 index cbcc6305bb..0000000000 --- a/libavfilter/vsrc_buffer.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2008 Vitor Sessak - * - * This file is part of Libav. - * - * Libav 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. - * - * Libav 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 Libav; 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 - */ - -#include "libavcodec/avcodec.h" /* AVFrame */ -#include "avfilter.h" - -#if FF_API_VSRC_BUFFER_ADD_FRAME -int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, - int64_t pts, AVRational pixel_aspect); -#endif - -#endif /* AVFILTER_VSRC_BUFFER_H */ |