falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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@gmail.com>
tags/n3.0
Paul B Mahol 9 years ago
parent
e3e55758dc
commit
494b792441
15 changed files with 15 additions and 15 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavfilter/af_adelay.c
  2. +1
    -1
      libavfilter/af_aecho.c
  3. +1
    -1
      libavfilter/af_afade.c
  4. +1
    -1
      libavfilter/af_aphaser.c
  5. +1
    -1
      libavfilter/af_astats.c
  6. +1
    -1
      libavfilter/af_biquads.c
  7. +1
    -1
      libavfilter/af_chorus.c
  8. +1
    -1
      libavfilter/af_compand.c
  9. +1
    -1
      libavfilter/af_dcshift.c
  10. +1
    -1
      libavfilter/af_dynaudnorm.c
  11. +1
    -1
      libavfilter/af_flanger.c
  12. +1
    -1
      libavfilter/af_ladspa.c
  13. +1
    -1
      libavfilter/af_sidechaincompress.c
  14. +1
    -1
      libavfilter/af_silenceremove.c
  15. +1
    -1
      libavfilter/f_reverse.c

+ 1
- 1
libavfilter/af_adelay.c View File

@@ -66,7 +66,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_aecho.c View File

@@ -160,7 +160,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_afade.c View File

@@ -70,7 +70,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_aphaser.c View File

@@ -96,7 +96,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_astats.c View File

@@ -74,7 +74,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_biquads.c View File

@@ -144,7 +144,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_chorus.c View File

@@ -162,7 +162,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_compand.c View File

@@ -109,7 +109,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_dcshift.c View File

@@ -61,7 +61,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_dynaudnorm.c View File

@@ -113,7 +113,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_flanger.c View File

@@ -97,7 +97,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/af_ladspa.c View File

@@ -612,7 +612,7 @@ static int query_formats(AVFilterContext *ctx)


if (s->nb_inputs == 1 && s->nb_outputs == 1) { if (s->nb_inputs == 1 && s->nb_outputs == 1) {
// We will instantiate multiple LADSPA_Handle, one over each channel // We will instantiate multiple LADSPA_Handle, one over each channel
layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);




+ 1
- 1
libavfilter/af_sidechaincompress.c View File

@@ -257,7 +257,7 @@ static int query_formats(AVFilterContext *ctx)
ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts); ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts);


for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts); ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts);


+ 1
- 1
libavfilter/af_silenceremove.c View File

@@ -420,7 +420,7 @@ static int query_formats(AVFilterContext *ctx)
}; };
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


+ 1
- 1
libavfilter/f_reverse.c View File

@@ -154,7 +154,7 @@ static int query_formats(AVFilterContext *ctx)
AVFilterChannelLayouts *layouts; AVFilterChannelLayouts *layouts;
int ret; int ret;


layouts = ff_all_channel_layouts();
layouts = ff_all_channel_counts();
if (!layouts) if (!layouts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_set_common_channel_layouts(ctx, layouts); ret = ff_set_common_channel_layouts(ctx, layouts);


Write Preview
Loading…
Cancel
Save