---
ffmpeg_filter.c | 2 +-
libavfilter/avfilter.c | 3 ++-
libavfilter/vf_aspect.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index ce2ffc0..4c7f7e7 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -538,7 +538,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 bcf8d3f..f4a4fe5 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -963,8 +963,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 84dbee9..bf30824 100644
--- 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,
--
2.1.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
