From 6f6c0294646bf992abd670d4c5c53c15a38346fd Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 17 Mar 2014 18:03:47 +0100 Subject: lavc: drop ff_pixfmt_list_420 --- libavcodec/flvdec.c | 5 ++++- libavcodec/intelh263dec.c | 5 ++++- libavcodec/mpegvideo.c | 5 ----- libavcodec/mpegvideo.h | 2 -- libavcodec/msmpeg4dec.c | 20 ++++++++++++++++---- libavcodec/rv10.c | 10 ++++++++-- libavcodec/rv30.c | 5 ++++- libavcodec/rv40.c | 5 ++++- libavcodec/vc1dec.c | 10 ++++++++-- libavcodec/wmv2dec.c | 5 ++++- 10 files changed, 52 insertions(+), 20 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 665208adde..c981e546cf 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -129,5 +129,8 @@ AVCodec ff_flv_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 78e3d52d89..8a0a381fb7 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -134,5 +134,8 @@ AVCodec ff_h263i_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 854fd4ceee..0fc77e807b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -105,11 +105,6 @@ const uint8_t *const ff_mpeg2_dc_scale_table[4] = { mpeg2_dc_scale_table3, }; -const enum AVPixelFormat ff_pixfmt_list_420[] = { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE -}; - static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, int16_t *block, int n, int qscale) { diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8a95f9a6e6..af2281ed51 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -735,8 +735,6 @@ void ff_MPV_motion(MpegEncContext *s, */ int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared); -extern const enum AVPixelFormat ff_pixfmt_list_420[]; - /** * permute block according to permuatation. * @param last last non zero element in scantable order diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 3e49c5992e..bf56bcc7e2 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -911,7 +911,10 @@ AVCodec ff_msmpeg4v1_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; AVCodec ff_msmpeg4v2_decoder = { @@ -924,7 +927,10 @@ AVCodec ff_msmpeg4v2_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; AVCodec ff_msmpeg4v3_decoder = { @@ -937,7 +943,10 @@ AVCodec ff_msmpeg4v3_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; AVCodec ff_wmv1_decoder = { @@ -950,5 +959,8 @@ AVCodec ff_wmv1_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index ddaaae1cc6..d0e61f0083 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -769,7 +769,10 @@ AVCodec ff_rv10_decoder = { .close = rv10_decode_end, .decode = rv10_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; AVCodec ff_rv20_decoder = { @@ -783,5 +786,8 @@ AVCodec ff_rv20_decoder = { .decode = rv10_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush = ff_mpeg_flush, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 307d54aac3..6b76651ff7 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -285,7 +285,10 @@ AVCodec ff_rv30_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), }; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index c9beeca1eb..e5b1821869 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -573,7 +573,10 @@ AVCodec ff_rv40_decoder = { .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, .init_thread_copy = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_rv34_decode_update_thread_context), }; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 49abd6297e..f8340eec99 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6179,7 +6179,10 @@ AVCodec ff_wmv3image_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .pix_fmts = ff_pixfmt_list_420 + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; #endif @@ -6195,6 +6198,9 @@ AVCodec ff_vc1image_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .pix_fmts = ff_pixfmt_list_420 + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; #endif diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 9b8cced33e..366aa1f6c1 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -475,5 +475,8 @@ AVCodec ff_wmv2_decoder = { .close = wmv2_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .pix_fmts = ff_pixfmt_list_420, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE + }, }; -- cgit v1.2.3