diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 01:55:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 13:56:03 +0200 |
| commit | 0acf7e268b2f873379cd854b4d5aaba6f9c1f0b5 (patch) | |
| tree | 99d22ceed57edd5407214fc26553ee0c7d1a69ce /libavfilter | |
| parent | 3fc7b47145da424b1908e1a86bc4e3b982be67f4 (diff) | |
| download | ffmpeg-0acf7e268b2f873379cd854b4d5aaba6f9c1f0b5.tar.gz | |
avfilter: remove opaque passing hacks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.c | 11 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 2d8e24508d..093bf56872 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -681,7 +681,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, return count; } -#if 0 #if FF_API_AVFILTER_INIT_FILTER int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque) { @@ -690,14 +689,6 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque #endif int avfilter_init_str(AVFilterContext *filter, const char *args) -#else -int avfilter_init_str(AVFilterContext *filter, const char *args) -{ - return avfilter_init_filter(filter, args, NULL); -} - -int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque) -#endif { AVDictionary *options = NULL; AVDictionaryEntry *e; @@ -812,7 +803,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque } if (filter->filter->init_opaque) - ret = filter->filter->init_opaque(filter, opaque); + ret = filter->filter->init_opaque(filter, NULL); else if (filter->filter->init) ret = filter->filter->init(filter); else if (filter->filter->init_dict) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 3e1d5ef467..582a87023d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -119,7 +119,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, if (!*filt_ctx) return AVERROR(ENOMEM); - ret = avfilter_init_filter(*filt_ctx, args, opaque); + ret = avfilter_init_str(*filt_ctx, args); if (ret < 0) goto fail; |