virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.

Browse Source
This commit is contained in:
Ronald S. Bultje 2015-08-16 22:26:16 -04:00
parent c1507db617
commit 6495c4c687
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg_filter.c
View File

@ -544,7 +544,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
av_get_default_channel_layout(ost->audio_channels_mapped)); av_get_default_channel_layout(ost->audio_channels_mapped));
for (i = 0; i < ost->audio_channels_mapped; i++) for (i = 0; i < ost->audio_channels_mapped; i++)
if (ost->audio_channels_map[i] != -1) if (ost->audio_channels_map[i] != -1)
av_bprintf(&pan_buf, ":c%d=c%d", i, ost->audio_channels_map[i]); av_bprintf(&pan_buf, "|c%d=c%d", i, ost->audio_channels_map[i]);
AUTO_INSERT_FILTER("-map_channel", "pan", pan_buf.str); AUTO_INSERT_FILTER("-map_channel", "pan", pan_buf.str);
av_bprint_finalize(&pan_buf, NULL); av_bprint_finalize(&pan_buf, NULL);

3
libavfilter/avfilter.c
View File

@ -976,8 +976,9 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} else
#endif #endif
} else { {
ret = process_options(filter, &options, args); ret = process_options(filter, &options, args);
if (ret < 0) if (ret < 0)
goto fail; goto fail;

2
libavfilter/vf_aspect.c
View File

@ -69,10 +69,10 @@ typedef struct AspectContext {
static av_cold int init(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx)
{ {
#if FF_API_OLD_FILTER_OPTS
AspectContext *s = ctx->priv; AspectContext *s = ctx->priv;
int ret; int ret;
#if FF_API_OLD_FILTER_OPTS
if (s->ratio_expr && s->aspect_den > 0) { if (s->ratio_expr && s->aspect_den > 0) {
double num; double num;
av_log(ctx, AV_LOG_WARNING, av_log(ctx, AV_LOG_WARNING,