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/audio: Remove unused array, move used-only-once array

Browse Source 
ff_planar_sample_fmts_array is unused (and was unused since it was added
in 4d4098da00) and therefore this commit
removes it; ff_packed_sample_fmts_array meanwhile is used only once (in
the amerge filter) and therefore it has been moved to this place.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-08-21 15:13:02 +02:00
parent 128e6df1cd
commit 2e0fd50319
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/af_amerge.c
View File

@@ -69,6 +69,14 @@ static av_cold void uninit(AVFilterContext *ctx)
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
{ {
static const enum AVSampleFormat packed_sample_fmts[] = {
AV_SAMPLE_FMT_U8,
AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_S32,
AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_DBL,
AV_SAMPLE_FMT_NONE
};
AMergeContext *s = ctx->priv; AMergeContext *s = ctx->priv;
int64_t inlayout[SWR_CH_MAX], outlayout = 0; int64_t inlayout[SWR_CH_MAX], outlayout = 0;
AVFilterFormats *formats; AVFilterFormats *formats;
@@ -124,7 +132,7 @@ static int query_formats(AVFilterContext *ctx)
if ((inlayout[i] >> c) & 1) if ((inlayout[i] >> c) & 1)
*(route[i]++) = out_ch_number++; *(route[i]++) = out_ch_number++;
} }
formats = ff_make_format_list(ff_packed_sample_fmts_array); formats = ff_make_format_list(packed_sample_fmts);
if ((ret = ff_set_common_formats(ctx, formats)) < 0) if ((ret = ff_set_common_formats(ctx, formats)) < 0)
return ret; return ret;
for (i = 0; i < s->nb_inputs; i++) { for (i = 0; i < s->nb_inputs; i++) {

18
libavfilter/audio.h
View File

@@ -25,24 +25,6 @@
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
static const enum AVSampleFormat ff_packed_sample_fmts_array[] = {
AV_SAMPLE_FMT_U8,
AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_S32,
AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_DBL,
AV_SAMPLE_FMT_NONE
};
static const enum AVSampleFormat ff_planar_sample_fmts_array[] = {
AV_SAMPLE_FMT_U8P,
AV_SAMPLE_FMT_S16P,
AV_SAMPLE_FMT_S32P,
AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_DBLP,
AV_SAMPLE_FMT_NONE
};
/** default handler for get_audio_buffer() for audio inputs */ /** default handler for get_audio_buffer() for audio inputs */
AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples); AVFrame *ff_default_get_audio_buffer(AVFilterLink *link, int nb_samples);