lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 6a59f0547ba5300b2fb2e1fcbba8e0f19255113a..10b2f5f72208f8c32d942f45561849c55eb2e791 100644 (file)
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -544,7 +544,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
                    av_get_default_channel_layout(ost->audio_channels_mapped));
         for (i = 0; i < ost->audio_channels_mapped; i++)
             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);
         av_bprint_finalize(&pan_buf, NULL);

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 6475f29f26da692f58574fc54d6ace398db458db..4d833f0544f243554d64bfa26d6da9dfcd3b6453 100644 (file)
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -976,8 +976,9 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
 
             if (ret < 0)
                 goto fail;
+        } else
 #endif
-        } else {
+        {
             ret = process_options(filter, &options, args);
             if (ret < 0)
                 goto fail;

diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index 84dbee95d5f57eee37b464dadb2f86915f34ddfd..bf3082485169ff8515bc09369b0fb466fa8aa5cc 100644 (file)
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -69,10 +69,10 @@ typedef struct AspectContext {
 
 static av_cold int init(AVFilterContext *ctx)
 {
+#if FF_API_OLD_FILTER_OPTS
     AspectContext *s = ctx->priv;
     int ret;
 
-#if FF_API_OLD_FILTER_OPTS
     if (s->ratio_expr && s->aspect_den > 0) {
         double num;
         av_log(ctx, AV_LOG_WARNING,