[FFmpeg-cvslog] avfilter: use ff_all_channel_counts() instead of ff_all_channel_layouts()

Paul B Mahol git at videolan.org
Sat Sep 12 20:55:31 CEST 2015


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Sep 11 18:51:10 2015 +0000| [494b792441622b9a3530b3cdf0a6609228a8945f] | committer: Paul B Mahol

avfilter: use ff_all_channel_counts() instead of ff_all_channel_layouts()

Fixes playback of some files with ffplay.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=494b792441622b9a3530b3cdf0a6609228a8945f
---

 libavfilter/af_adelay.c            |    2 +-
 libavfilter/af_aecho.c             |    2 +-
 libavfilter/af_afade.c             |    2 +-
 libavfilter/af_aphaser.c           |    2 +-
 libavfilter/af_astats.c            |    2 +-
 libavfilter/af_biquads.c           |    2 +-
 libavfilter/af_chorus.c            |    2 +-
 libavfilter/af_compand.c           |    2 +-
 libavfilter/af_dcshift.c           |    2 +-
 libavfilter/af_dynaudnorm.c        |    2 +-
 libavfilter/af_flanger.c           |    2 +-
 libavfilter/af_ladspa.c            |    2 +-
 libavfilter/af_sidechaincompress.c |    2 +-
 libavfilter/af_silenceremove.c     |    2 +-
 libavfilter/f_reverse.c            |    2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c
index ca141ce..6bae446 100644
--- a/libavfilter/af_adelay.c
+++ b/libavfilter/af_adelay.c
@@ -66,7 +66,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c
index 8e7a39e..7e7a9d5 100644
--- a/libavfilter/af_aecho.c
+++ b/libavfilter/af_aecho.c
@@ -160,7 +160,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
index c35978f..7168eba 100644
--- a/libavfilter/af_afade.c
+++ b/libavfilter/af_afade.c
@@ -70,7 +70,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c
index 13fe901..33ecb1a 100644
--- a/libavfilter/af_aphaser.c
+++ b/libavfilter/af_aphaser.c
@@ -96,7 +96,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c
index fa7278e..f385d2e 100644
--- a/libavfilter/af_astats.c
+++ b/libavfilter/af_astats.c
@@ -74,7 +74,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c
index b910687..b5b258f 100644
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@@ -144,7 +144,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_chorus.c b/libavfilter/af_chorus.c
index 93fb36b..2bdaca3 100644
--- a/libavfilter/af_chorus.c
+++ b/libavfilter/af_chorus.c
@@ -162,7 +162,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
index 610787f..6724121 100644
--- a/libavfilter/af_compand.c
+++ b/libavfilter/af_compand.c
@@ -109,7 +109,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_dcshift.c b/libavfilter/af_dcshift.c
index eb98156..7332c12 100644
--- a/libavfilter/af_dcshift.c
+++ b/libavfilter/af_dcshift.c
@@ -61,7 +61,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c
index d71a79a..e585648 100644
--- a/libavfilter/af_dynaudnorm.c
+++ b/libavfilter/af_dynaudnorm.c
@@ -113,7 +113,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_flanger.c b/libavfilter/af_flanger.c
index 106e6f7..39d4e7b 100644
--- a/libavfilter/af_flanger.c
+++ b/libavfilter/af_flanger.c
@@ -97,7 +97,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c
index 144db2e..1efe3f0 100644
--- a/libavfilter/af_ladspa.c
+++ b/libavfilter/af_ladspa.c
@@ -612,7 +612,7 @@ static int query_formats(AVFilterContext *ctx)
 
     if (s->nb_inputs == 1 && s->nb_outputs == 1) {
         // We will instantiate multiple LADSPA_Handle, one over each channel
-        layouts = ff_all_channel_layouts();
+        layouts = ff_all_channel_counts();
         if (!layouts)
             return AVERROR(ENOMEM);
 
diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c
index afae9be..e45fd72 100644
--- a/libavfilter/af_sidechaincompress.c
+++ b/libavfilter/af_sidechaincompress.c
@@ -257,7 +257,7 @@ static int query_formats(AVFilterContext *ctx)
     ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts);
 
     for (i = 0; i < 2; i++) {
-        layouts = ff_all_channel_layouts();
+        layouts = ff_all_channel_counts();
         if (!layouts)
             return AVERROR(ENOMEM);
         ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts);
diff --git a/libavfilter/af_silenceremove.c b/libavfilter/af_silenceremove.c
index 3323838..00a3959 100644
--- a/libavfilter/af_silenceremove.c
+++ b/libavfilter/af_silenceremove.c
@@ -420,7 +420,7 @@ static int query_formats(AVFilterContext *ctx)
     };
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);
diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c
index 10529df..37c25e9 100644
--- a/libavfilter/f_reverse.c
+++ b/libavfilter/f_reverse.c
@@ -154,7 +154,7 @@ static int query_formats(AVFilterContext *ctx)
     AVFilterChannelLayouts *layouts;
     int ret;
 
-    layouts = ff_all_channel_layouts();
+    layouts = ff_all_channel_counts();
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);



More information about the ffmpeg-cvslog mailing list