virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-14 22:15:12 +02:00
Code Issues Releases Activity

lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft

Browse Source
This commit is contained in:
Anton Khirnov
2012-06-17 12:36:52 +02:00
parent 6c1e065bd4
commit 0b3b958135
4 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/Makefile
View File

@ -10,7 +10,6 @@ HEADERS = avfilter.h \
buffersink.h \ buffersink.h \
buffersrc.h \ buffersrc.h \
version.h \ version.h \
vsrc_buffer.h \
OBJS = allfilters.o \ OBJS = allfilters.o \
audio.o \ audio.o \

20
libavfilter/buffersrc.c
View File

@ -29,7 +29,6 @@
#include "formats.h" #include "formats.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
#include "vsrc_buffer.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
@ -70,25 +69,6 @@ typedef struct {
return AVERROR(EINVAL);\ 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) int av_buffersrc_write_frame(AVFilterContext *buffer_filter, AVFrame *frame)
{ {
BufferSourceContext *c = buffer_filter->priv; BufferSourceContext *c = buffer_filter->priv;

3
libavfilter/version.h
View File

@ -44,9 +44,6 @@
* Those FF_API_* defines are not part of public API. * Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time. * 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 #ifndef FF_API_DEFAULT_CONFIG_OUTPUT_LINK
#define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3) #define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3)
#endif #endif

37
libavfilter/vsrc_buffer.h
View File

@ -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 */