diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 00:34:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 00:34:36 +0200 |
| commit | 5916bc46581230c68c946c0b4733cce381eddcbd (patch) | |
| tree | 016c3ddabcec1e8ff2b50a375d9377eb31319842 /libavfilter/avfilter.c | |
| parent | 052f4f859cfee9bb86ea3ccb0c56ea11d050ef17 (diff) | |
| parent | 1961e46c15c23a041f8d8614a25388a3ee9eff63 (diff) | |
| download | ffmpeg-5916bc46581230c68c946c0b4733cce381eddcbd.tar.gz | |
Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'
* commit '1961e46c15c23a041f8d8614a25388a3ee9eff63':
lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft
lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
lavfi: use proper FF_API guards for different deprecated functions
lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
lavfi: remove disabled FF_API_SAMPLERATE64 cruft
lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft
Conflicts:
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/video.c
libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 7146a64005..ae702df111 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -560,38 +560,3 @@ enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx) { return pads[pad_idx].type; } - -#if FF_API_DEFAULT_CONFIG_OUTPUT_LINK -void avfilter_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, - AVFilterPad **pads, AVFilterLink ***links, - AVFilterPad *newpad) -{ - ff_insert_pad(idx, count, padidx_off, pads, links, newpad); -} -void avfilter_insert_inpad(AVFilterContext *f, unsigned index, - AVFilterPad *p) -{ - ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad), - &f->input_pads, &f->inputs, p); -#if FF_API_FOO_COUNT - f->input_count = f->nb_inputs; -#endif -} -void avfilter_insert_outpad(AVFilterContext *f, unsigned index, - AVFilterPad *p) -{ - ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad), - &f->output_pads, &f->outputs, p); -#if FF_API_FOO_COUNT - f->output_count = f->nb_outputs; -#endif -} -int avfilter_poll_frame(AVFilterLink *link) -{ - return ff_poll_frame(link); -} -int avfilter_request_frame(AVFilterLink *link) -{ - return ff_request_frame(link); -} -#endif |