diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 01:18:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 01:18:40 +0100 |
commit | 0f16dfda50cb6b7b13e2a3f02f0823f67eeca748 (patch) | |
tree | 7076e88c327db607dcee8e4b07f011d9222aeeef /libavfilter | |
parent | 4fae55632236277865f736431bdf1dfaa0649116 (diff) | |
download | ffmpeg-streaming-0f16dfda50cb6b7b13e2a3f02f0823f67eeca748.zip ffmpeg-streaming-0f16dfda50cb6b7b13e2a3f02f0823f67eeca748.tar.gz |
Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/vf_elbg.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_fspp.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_geq.c | 4 | ||||
-rw-r--r-- | libavfilter/vf_histeq.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_kerndeint.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_mcdeint.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_pp.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_pp7.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_psnr.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_rotate.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_spp.c | 2 | ||||
-rw-r--r-- | libavfilter/vf_uspp.c | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index 3b8654f..8656070 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 e4de0f5..5283ef8 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 49a3e62..b0f53a6 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 5e560cf..ce28afd 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 ccb8fbd..1158fdb 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 402a6cc..fc91d2f 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 e33ac48..ff60e61 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 0a70902..1decdcc 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 082612a..a76a9f9 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 8dec742..e5eff6b 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 4235544..19c2c72 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 a60e513..6ce3e59 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, |