virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter: remove old shorthand system

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-12 10:55:46 +02:00
parent 9c5f392cbc
commit 04924bc923
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavfilter/avfilter.c
View File

@ -681,21 +681,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
return count;
}
// TODO: drop me
static const char *const filters_left_to_update[] = {
#if FF_API_ACONVERT_FILTER
"aconvert",
#endif
};
static int filter_use_deprecated_init(const char *name)
{
int i;
for (i = 0; i < FF_ARRAY_ELEMS(filters_left_to_update); i++)
if (!strcmp(name, filters_left_to_update[i]))
return 1;
return 0;
}
#if 0
#if FF_API_AVFILTER_INIT_FILTER
int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque)
@ -717,22 +702,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
AVDictionary *options = NULL;
AVDictionaryEntry *e;
int ret=0;
int deprecated_init = filter_use_deprecated_init(filter->filter->name);
// TODO: remove old shorthand
if (filter->filter->shorthand) {
av_assert0(filter->priv);
av_assert0(filter->filter->priv_class);
*(const AVClass **)filter->priv = filter->filter->priv_class;
av_opt_set_defaults(filter->priv);
ret = av_opt_set_from_string(filter->priv, args,
filter->filter->shorthand, "=", ":");
if (ret < 0)
return ret;
args = NULL;
}
if (!deprecated_init && args && *args) {
if (args && *args) {
if (!filter->filter->priv_class) {
av_log(filter, AV_LOG_ERROR, "This filter does not take any "
"options, but options were provided: %s.\n", args);
@ -858,7 +829,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
}
}
if (!deprecated_init && filter->filter->priv_class) {
if (filter->filter->priv_class) {
ret = av_opt_set_dict(filter->priv, &options);
if (ret < 0) {
av_log(filter, AV_LOG_ERROR, "Error applying options to the filter.\n");