RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter: remove opaque passing hacks 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-12 01:55:59 +02:00
parent 3fc7b47145
commit 0acf7e268b
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/avfilter.c
View File

@ -681,7 +681,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
return count; return count;
} }
#if 0
#if FF_API_AVFILTER_INIT_FILTER #if FF_API_AVFILTER_INIT_FILTER
int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque) 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 #endif
int avfilter_init_str(AVFilterContext *filter, const char *args) 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; AVDictionary *options = NULL;
AVDictionaryEntry *e; AVDictionaryEntry *e;
@ -812,7 +803,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
} }
if (filter->filter->init_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) else if (filter->filter->init)
ret = filter->filter->init(filter); ret = filter->filter->init(filter);
else if (filter->filter->init_dict) else if (filter->filter->init_dict)

2
libavfilter/avfiltergraph.c
View File

@ -119,7 +119,7 @@ int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
if (!*filt_ctx) if (!*filt_ctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = avfilter_init_filter(*filt_ctx, args, opaque); ret = avfilter_init_str(*filt_ctx, args);
if (ret < 0) if (ret < 0)
goto fail; goto fail;