virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter: use ff_all_channel_counts() instead of ff_all_channel_layouts()

Browse Source 
Fixes playback of some files with ffplay.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2015-09-11 18:51:10 +00:00
parent e3e55758dc
commit 494b792441
15 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/af_adelay.c
View File

@@ -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);

2
libavfilter/af_aecho.c
View File

@@ -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);

2
libavfilter/af_afade.c
View File

@@ -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);

2
libavfilter/af_aphaser.c
View File

@@ -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);

2
libavfilter/af_astats.c
View File

@@ -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);

2
libavfilter/af_biquads.c
View File

@@ -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);

2
libavfilter/af_chorus.c
View File

@@ -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);

2
libavfilter/af_compand.c
View File

@@ -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);

2
libavfilter/af_dcshift.c
View File

@@ -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);

2
libavfilter/af_dynaudnorm.c
View File

@@ -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);

2
libavfilter/af_flanger.c
View File

@@ -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);

2
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) {
// 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);

2
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);
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);

2
libavfilter/af_silenceremove.c
View File

@@ -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);

2
libavfilter/f_reverse.c
View File

@@ -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);