generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'

Browse Source 
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
  graphparser: only print filter arguments if they are non-NULL
  af_channelmap: ensure the output channel layout is valid.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-01 10:16:27 +02:00
commit e41d3aba01
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/af_channelmap.c
View File

@ -271,6 +271,12 @@ static av_cold int channelmap_init(AVFilterContext *ctx)
} }
s->output_layout = fmt; s->output_layout = fmt;
} }
if (!s->output_layout) {
av_log(ctx, AV_LOG_ERROR, "Output channel layout is not set and "
"cannot be guessed from the maps.\n");
return AVERROR(EINVAL);
}
ff_add_channel_layout(&s->channel_layouts, s->output_layout); ff_add_channel_layout(&s->channel_layouts, s->output_layout);
if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) { if (mode == MAP_PAIR_INT_STR || mode == MAP_PAIR_STR_STR) {

5
libavfilter/graphparser.c
View File

@ -126,7 +126,10 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind
ret = avfilter_init_str(*filt_ctx, args); ret = avfilter_init_str(*filt_ctx, args);
if (ret < 0) { if (ret < 0) {
av_log(log_ctx, AV_LOG_ERROR, av_log(log_ctx, AV_LOG_ERROR,
"Error initializing filter '%s' with args '%s'\n", filt_name, args); "Error initializing filter '%s'", filt_name);
if (args)
av_log(log_ctx, AV_LOG_ERROR, " with args '%s'", args);
av_log(log_ctx, AV_LOG_ERROR, "\n");
return ret; return ret;
} }