Skip to content

Commit 6886967

Browse files
committed
avfilter/vf_vidstab(detect|transform): Deduplicate pixel formats
Signed-off-by: Andreas Rheinhardt <[email protected]>
1 parent e54b9bb commit 6886967

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

libavfilter/vf_vidstabdetect.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,7 @@ static av_cold void uninit(AVFilterContext *ctx)
8484

8585
static int query_formats(AVFilterContext *ctx)
8686
{
87-
// If you add something here also add it in vidstabutils.c
88-
static const enum AVPixelFormat pix_fmts[] = {
89-
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
90-
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P,
91-
AV_PIX_FMT_YUV440P, AV_PIX_FMT_GRAY8,
92-
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA,
93-
AV_PIX_FMT_NONE
94-
};
95-
96-
return ff_set_common_formats_from_list(ctx, pix_fmts);
87+
return ff_set_common_formats_from_list(ctx, ff_vidstab_pix_fmts);
9788
}
9889

9990
static int config_input(AVFilterLink *inlink)

libavfilter/vf_vidstabtransform.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,7 @@ static av_cold void uninit(AVFilterContext *ctx)
123123

124124
static int query_formats(AVFilterContext *ctx)
125125
{
126-
// If you add something here also add it in vidstabutils.c
127-
static const enum AVPixelFormat pix_fmts[] = {
128-
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
129-
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P,
130-
AV_PIX_FMT_YUV440P, AV_PIX_FMT_GRAY8,
131-
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA,
132-
AV_PIX_FMT_NONE
133-
};
134-
135-
return ff_set_common_formats_from_list(ctx, pix_fmts);
126+
return ff_set_common_formats_from_list(ctx, ff_vidstab_pix_fmts);
136127
}
137128

138129

libavfilter/vidstabutils.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020

2121
#include "vidstabutils.h"
2222

23+
const enum AVPixelFormat ff_vidstab_pix_fmts[] = {
24+
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
25+
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA420P,
26+
AV_PIX_FMT_YUV440P, AV_PIX_FMT_GRAY8,
27+
AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGBA,
28+
AV_PIX_FMT_NONE
29+
};
30+
2331
/** convert AV's pixelformat to vid.stab pixelformat */
2432
VSPixelFormat ff_av2vs_pixfmt(AVFilterContext *ctx, enum AVPixelFormat pf)
2533
{

libavfilter/vidstabutils.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
#include "avfilter.h"
2727

28+
extern const enum AVPixelFormat ff_vidstab_pix_fmts[];
29+
2830
/* Conversion routines between libav* and vid.stab */
2931

3032
/**

0 commit comments

Comments
 (0)