lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.
authorRonald S. Bultje <rsbultje@gmail.com>
Mon, 17 Aug 2015 02:26:16 +0000 (22:26 -0400)
committerRonald S. Bultje <rsbultje@gmail.com>
Wed, 19 Aug 2015 02:22:49 +0000 (22:22 -0400)
ffmpeg_filter.c
libavfilter/avfilter.c
libavfilter/vf_aspect.c

index 6a59f05..10b2f5f 100644 (file)
@@ -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);
index 6475f29..4d833f0 100644 (file)
@@ -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;
index 84dbee9..bf30824 100644 (file)
@@ -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,