From 0f16dfda50cb6b7b13e2a3f02f0823f67eeca748 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 18 Mar 2015 01:18:40 +0100 Subject: [PATCH] Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats Signed-off-by: Michael Niedermayer --- libavcodec/smvjpegdec.c | 2 +- libavcodec/xfaceenc.c | 2 +- libavfilter/vf_elbg.c | 2 +- libavfilter/vf_fspp.c | 2 +- libavfilter/vf_geq.c | 4 ++-- libavfilter/vf_histeq.c | 2 +- libavfilter/vf_kerndeint.c | 2 +- libavfilter/vf_mcdeint.c | 2 +- libavfilter/vf_pp.c | 2 +- libavfilter/vf_pp7.c | 2 +- libavfilter/vf_psnr.c | 2 +- libavfilter/vf_rotate.c | 2 +- libavfilter/vf_spp.c | 2 +- libavfilter/vf_uspp.c | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 375c9d91c3..5eca9bb6a2 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -50,7 +50,7 @@ static inline void smv_img_pnt_plane(uint8_t **dst, uint8_t *src, static inline void smv_img_pnt(uint8_t *dst_data[4], uint8_t *src_data[4], const int src_linesizes[4], - enum PixelFormat pix_fmt, int width, int height, + enum AVPixelFormat pix_fmt, int width, int height, int nlines) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); diff --git a/libavcodec/xfaceenc.c b/libavcodec/xfaceenc.c index 93abd467f4..fa6f22734b 100644 --- a/libavcodec/xfaceenc.c +++ b/libavcodec/xfaceenc.c @@ -237,5 +237,5 @@ AVCodec ff_xface_encoder = { .init = xface_encode_init, .close = xface_encode_close, .encode2 = xface_encode_frame, - .pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, }; diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index 3b8654f17d..86560708af 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -75,7 +75,7 @@ static av_cold int init(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c index e4de0f5713..5283ef8a5e 100644 --- a/libavfilter/vf_fspp.c +++ b/libavfilter/vf_fspp.c @@ -492,7 +492,7 @@ static void row_fdct_c(int16_t *data, const uint8_t *pixels, ptrdiff_t line_size static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index 49a3e6285e..b0f53a62b5 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -165,14 +165,14 @@ end: static int geq_query_formats(AVFilterContext *ctx) { GEQContext *geq = ctx->priv; - static const enum PixelFormat yuv_pix_fmts[] = { + static const enum AVPixelFormat yuv_pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; - static const enum PixelFormat rgb_pix_fmts[] = { + static const enum AVPixelFormat rgb_pix_fmts[] = { AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE }; diff --git a/libavfilter/vf_histeq.c b/libavfilter/vf_histeq.c index 5e560cff17..ce28afdad6 100644 --- a/libavfilter/vf_histeq.c +++ b/libavfilter/vf_histeq.c @@ -94,7 +94,7 @@ static av_cold int init(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE diff --git a/libavfilter/vf_kerndeint.c b/libavfilter/vf_kerndeint.c index ccb8fbd810..1158fdb10c 100644 --- a/libavfilter/vf_kerndeint.c +++ b/libavfilter/vf_kerndeint.c @@ -68,7 +68,7 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUYV422, AV_PIX_FMT_ARGB, AV_PIX_FMT_0RGB, diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 402a6cc381..fc91d2f1bd 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -160,7 +160,7 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }; AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c index e33ac48a14..ff60e61dac 100644 --- a/libavfilter/vf_pp.c +++ b/libavfilter/vf_pp.c @@ -75,7 +75,7 @@ static int pp_process_command(AVFilterContext *ctx, const char *cmd, const char static int pp_query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV411P, diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c index 0a709021c6..1decdccc22 100644 --- a/libavfilter/vf_pp7.c +++ b/libavfilter/vf_pp7.c @@ -272,7 +272,7 @@ static void filter(PP7Context *p, uint8_t *dst, uint8_t *src, static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 082612ad54..a76a9f9da2 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -217,7 +217,7 @@ static av_cold int init(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, #define PF_NOALPHA(suf) AV_PIX_FMT_YUV420##suf, AV_PIX_FMT_YUV422##suf, AV_PIX_FMT_YUV444##suf #define PF_ALPHA(suf) AV_PIX_FMT_YUVA420##suf, AV_PIX_FMT_YUVA422##suf, AV_PIX_FMT_YUVA444##suf diff --git a/libavfilter/vf_rotate.c b/libavfilter/vf_rotate.c index 8dec74279f..e5eff6b589 100644 --- a/libavfilter/vf_rotate.c +++ b/libavfilter/vf_rotate.c @@ -130,7 +130,7 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 4235544b9d..19c2c72d22 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -303,7 +303,7 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src, static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index a60e51312b..6ce3e596b0 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -284,7 +284,7 @@ static void filter(USPPContext *p, uint8_t *dst[3], uint8_t *src[3], static int query_formats(AVFilterContext *ctx) { - static const enum PixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV410P,