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/formats.c | |
| parent | 052f4f859cfee9bb86ea3ccb0c56ea11d050ef17 (diff) | |
| parent | 1961e46c15c23a041f8d8614a25388a3ee9eff63 (diff) | |
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/formats.c')
| -rw-r--r-- | libavfilter/formats.c | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index d442eb5a1a..62facc6634 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -525,45 +525,6 @@ int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx) return 0; } -#if FF_API_FILTERS_PUBLIC -int avfilter_default_query_formats(AVFilterContext *ctx) -{ - return ff_default_query_formats(ctx); -} -void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats) -{ - ff_set_common_formats(ctx, formats); -} -AVFilterFormats *avfilter_make_format_list(const int *fmts) -{ - return ff_make_format_list(fmts); -} -int avfilter_add_format(AVFilterFormats **avff, int64_t fmt) -{ - return ff_add_format(avff, fmt); -} -AVFilterFormats *avfilter_all_formats(enum AVMediaType type) -{ - return ff_all_formats(type); -} -AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) -{ - return ff_merge_formats(a, b); -} -void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref) -{ - ff_formats_ref(f, ref); -} -void avfilter_formats_unref(AVFilterFormats **ref) -{ - ff_formats_unref(ref); -} -void avfilter_formats_changeref(AVFilterFormats **oldref, - AVFilterFormats **newref) -{ - ff_formats_changeref(oldref, newref); -} -#endif #ifdef TEST #undef printf @@ -582,3 +543,4 @@ int main(void) } #endif + |