highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'

Browse Source 
* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
  vf_frei0r: adjust error messages

Conflicts:
	libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-04 12:41:31 +01:00
commit 2b0ff8d642
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/vf_frei0r.c
View File

@ -81,7 +81,7 @@ static void *load_sym(AVFilterContext *ctx, const char *sym_name)
Frei0rContext *s = ctx->priv; Frei0rContext *s = ctx->priv;
void *sym = dlsym(s->dl_handle, sym_name); void *sym = dlsym(s->dl_handle, sym_name);
if (!sym) if (!sym)
av_log(ctx, AV_LOG_ERROR, "Could not find symbol '%s' in loaded module\n", sym_name); av_log(ctx, AV_LOG_ERROR, "Could not find symbol '%s' in loaded module.\n", sym_name);
return sym; return sym;
} }
@ -129,7 +129,7 @@ static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, cha
return 0; return 0;
fail: fail:
av_log(ctx, AV_LOG_ERROR, "Invalid value '%s' for parameter '%s'\n", av_log(ctx, AV_LOG_ERROR, "Invalid value '%s' for parameter '%s'.\n",
param, info.name); param, info.name);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -202,11 +202,11 @@ static int set_params(AVFilterContext *ctx, const char *params)
default: /* F0R_PARAM_STRING */ default: /* F0R_PARAM_STRING */
v = s; v = s;
s->get_param_value(s->instance, v, i); s->get_param_value(s->instance, v, i);
av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s); av_log(ctx, AV_LOG_DEBUG, "'%s'", s);
break; break;
} }
#endif #endif
av_log(ctx, AV_LOG_VERBOSE, "\n"); av_log(ctx, AV_LOG_VERBOSE, ".\n");
} }
return 0; return 0;
@ -217,7 +217,7 @@ static int load_path(AVFilterContext *ctx, void **handle_ptr, const char *prefix
char *path = av_asprintf("%s%s%s", prefix, name, SLIBSUF); char *path = av_asprintf("%s%s%s", prefix, name, SLIBSUF);
if (!path) if (!path)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'\n", path); av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'.\n", path);
*handle_ptr = dlopen(path, RTLD_NOW|RTLD_LOCAL); *handle_ptr = dlopen(path, RTLD_NOW|RTLD_LOCAL);
av_free(path); av_free(path);
return 0; return 0;
@ -288,7 +288,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
return ret; return ret;
} }
if (!s->dl_handle) { if (!s->dl_handle) {
av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'\n", dl_name); av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'.\n", dl_name);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -304,7 +304,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
return AVERROR(EINVAL); return AVERROR(EINVAL);
if (f0r_init() < 0) { if (f0r_init() < 0) {
av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module\n"); av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -312,7 +312,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
pi = &s->plugin_info; pi = &s->plugin_info;
if (pi->plugin_type != type) { if (pi->plugin_type != type) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Invalid type '%s' for the plugin\n", "Invalid type '%s' for this plugin\n",
pi->plugin_type == F0R_PLUGIN_TYPE_FILTER ? "filter" : pi->plugin_type == F0R_PLUGIN_TYPE_FILTER ? "filter" :
pi->plugin_type == F0R_PLUGIN_TYPE_SOURCE ? "source" : pi->plugin_type == F0R_PLUGIN_TYPE_SOURCE ? "source" :
pi->plugin_type == F0R_PLUGIN_TYPE_MIXER2 ? "mixer2" : pi->plugin_type == F0R_PLUGIN_TYPE_MIXER2 ? "mixer2" :
@ -359,7 +359,7 @@ static int config_input_props(AVFilterLink *inlink)
if (s->destruct && s->instance) if (s->destruct && s->instance)
s->destruct(s->instance); s->destruct(s->instance);
if (!(s->instance = s->construct(inlink->w, inlink->h))) { if (!(s->instance = s->construct(inlink->w, inlink->h))) {
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n"); av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -476,7 +476,7 @@ static int source_config_props(AVFilterLink *outlink)
if (s->destruct && s->instance) if (s->destruct && s->instance)
s->destruct(s->instance); s->destruct(s->instance);
if (!(s->instance = s->construct(outlink->w, outlink->h))) { if (!(s->instance = s->construct(outlink->w, outlink->h))) {
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n"); av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }