From 2ba8301769b770ec96ea8f4c02da78a25c6458fe Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Sun, 6 Sep 2009 16:09:21 +0000 Subject: Mark all pix_fmts and supported_framerates compound literals as const. Makes no difference for gcc but at least icc can put them in .rodata then. Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/asv1.c | 4 ++-- libavcodec/bmpenc.c | 2 +- libavcodec/dnxhdenc.c | 2 +- libavcodec/dv.c | 2 +- libavcodec/ffv1.c | 2 +- libavcodec/flashsv.c | 2 +- libavcodec/flashsvenc.c | 2 +- libavcodec/gif.c | 2 +- libavcodec/h261enc.c | 2 +- libavcodec/huffyuv.c | 4 ++-- libavcodec/jpeglsenc.c | 2 +- libavcodec/libdiracenc.c | 2 +- libavcodec/libschroedingerenc.c | 2 +- libavcodec/libx264.c | 2 +- libavcodec/libxvidff.c | 2 +- libavcodec/mjpegenc.c | 2 +- libavcodec/mpeg12enc.c | 4 ++-- libavcodec/mpegvideo_enc.c | 16 ++++++++-------- libavcodec/pcxenc.c | 2 +- libavcodec/pngenc.c | 2 +- libavcodec/pnmenc.c | 20 ++++++++++---------- libavcodec/qtrleenc.c | 2 +- libavcodec/roqvideoenc.c | 4 ++-- libavcodec/rv10enc.c | 2 +- libavcodec/rv20enc.c | 2 +- libavcodec/sgienc.c | 2 +- libavcodec/svq1dec.c | 2 +- libavcodec/svq1enc.c | 2 +- libavcodec/svq3.c | 2 +- libavcodec/targaenc.c | 2 +- libavcodec/tiffenc.c | 2 +- libavcodec/v210enc.c | 2 +- libavcodec/vc1dec.c | 4 ++-- libavcodec/wmv2enc.c | 2 +- libavcodec/zmbvenc.c | 2 +- 35 files changed, 56 insertions(+), 56 deletions(-) diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index c9a3d24944..5f9d5232fd 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -645,7 +645,7 @@ AVCodec asv1_encoder = { encode_init, encode_frame, //encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"), }; #endif @@ -659,7 +659,7 @@ AVCodec asv2_encoder = { encode_init, encode_frame, //encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), }; #endif diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 578813af60..34362b8529 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -139,7 +139,7 @@ AVCodec bmp_encoder = { bmp_encode_init, bmp_encode_frame, NULL, //encode_end, - .pix_fmts = (enum PixelFormat[]){ + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_RGB565, PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8, diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 5a4c74c52a..113e8d176c 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -804,6 +804,6 @@ AVCodec dnxhd_encoder = { dnxhd_encode_init, dnxhd_encode_picture, dnxhd_encode_end, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), }; diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 95b2b798dc..078c30dbb6 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -1324,7 +1324,7 @@ AVCodec dvvideo_encoder = { sizeof(DVVideoContext), dvvideo_init, dvvideo_encode_frame, - .pix_fmts = (enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), }; #endif // CONFIG_DVVIDEO_ENCODER diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index b6f9831e35..bde577c55b 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1147,7 +1147,7 @@ AVCodec ffv1_encoder = { encode_init, encode_frame, common_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), }; #endif diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 20c85e3ac0..dd8236018a 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -256,6 +256,6 @@ AVCodec flashsv_decoder = { flashsv_decode_end, flashsv_decode_frame, CODEC_CAP_DR1, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"), }; diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index f207f8d078..3512b02698 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -292,7 +292,7 @@ AVCodec flashsv_encoder = { flashsv_encode_init, flashsv_encode_frame, flashsv_encode_end, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"), }; diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 8cd51c5b74..c3ec3a9838 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -174,6 +174,6 @@ AVCodec gif_encoder = { gif_encode_init, gif_encode_frame, NULL, //encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), }; diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index af8969e031..9220273521 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -328,7 +328,7 @@ AVCodec h261_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("H.261"), }; diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 53142c074e..f8b55c4c60 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -1487,7 +1487,7 @@ AVCodec huffyuv_encoder = { encode_init, encode_frame, encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; #endif @@ -1501,7 +1501,7 @@ AVCodec ffvhuff_encoder = { encode_init, encode_frame, encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 4224a24633..ea12ddaae4 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -390,6 +390,6 @@ AVCodec jpegls_encoder = { //FIXME avoid MPV_* lossless JPEG should not need the encode_init_ls, encode_picture_ls, NULL, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("JPEG-LS"), }; diff --git a/libavcodec/libdiracenc.c b/libavcodec/libdiracenc.c index 3fd3ed2cb9..6770eb7c3f 100644 --- a/libavcodec/libdiracenc.c +++ b/libavcodec/libdiracenc.c @@ -400,6 +400,6 @@ AVCodec libdirac_encoder = { libdirac_encode_frame, libdirac_encode_close, .capabilities = CODEC_CAP_DELAY, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"), }; diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index 9f8d95cc3e..44d4dcd428 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -414,6 +414,6 @@ AVCodec libschroedinger_encoder = { libschroedinger_encode_frame, libschroedinger_encode_close, .capabilities = CODEC_CAP_DELAY, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), }; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 21334c9460..8b57e62ba0 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -320,6 +320,6 @@ AVCodec libx264_encoder = { .encode = X264_frame, .close = X264_close, .capabilities = CODEC_CAP_DELAY, - .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE }, + .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), }; diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index bdf70a09df..bb73f505bb 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -775,6 +775,6 @@ AVCodec libxvid_encoder = { ff_xvid_encode_init, ff_xvid_encode_frame, ff_xvid_encode_close, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), }; diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 8369e9c946..03c24153a1 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -454,6 +454,6 @@ AVCodec mjpeg_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), }; diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 1b5632dbcb..013b395d17 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -934,7 +934,7 @@ AVCodec mpeg1video_encoder = { MPV_encode_picture, MPV_encode_end, .supported_framerates= ff_frame_rate_tab+1, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .capabilities= CODEC_CAP_DELAY, .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; @@ -948,7 +948,7 @@ AVCodec mpeg2video_encoder = { MPV_encode_picture, MPV_encode_end, .supported_framerates= ff_frame_rate_tab+1, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE}, .capabilities= CODEC_CAP_DELAY, .long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"), }; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6159078077..9036588ee4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3730,7 +3730,7 @@ AVCodec h263_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"), }; @@ -3742,7 +3742,7 @@ AVCodec h263p_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), }; @@ -3754,7 +3754,7 @@ AVCodec flv_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV)"), }; @@ -3766,7 +3766,7 @@ AVCodec mpeg4_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .capabilities= CODEC_CAP_DELAY, .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), }; @@ -3779,7 +3779,7 @@ AVCodec msmpeg4v1_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), }; @@ -3791,7 +3791,7 @@ AVCodec msmpeg4v2_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), }; @@ -3803,7 +3803,7 @@ AVCodec msmpeg4v3_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), }; @@ -3815,6 +3815,6 @@ AVCodec wmv1_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), }; diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index 36f7d1d84c..17fa3c2f47 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -197,7 +197,7 @@ AVCodec pcx_encoder = { pcx_encode_init, pcx_encode_frame, NULL, - .pix_fmts = (enum PixelFormat[]){ + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_RGB24, PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8, PIX_FMT_MONOBLACK, diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 40dadc863b..4638095e11 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -444,6 +444,6 @@ AVCodec png_encoder = { png_enc_init, encode_frame, NULL, //encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PNG image"), }; diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index c60e4da2c0..e619fc36cf 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -374,7 +374,7 @@ AVCodec pgm_decoder = { NULL, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif @@ -387,7 +387,7 @@ AVCodec pgm_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif // CONFIG_PGM_ENCODER @@ -403,7 +403,7 @@ AVCodec pgmyuv_decoder = { NULL, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif @@ -416,7 +416,7 @@ AVCodec pgmyuv_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif // CONFIG_PGMYUV_ENCODER @@ -432,7 +432,7 @@ AVCodec ppm_decoder = { NULL, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif @@ -445,7 +445,7 @@ AVCodec ppm_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif // CONFIG_PPM_ENCODER @@ -461,7 +461,7 @@ AVCodec pbm_decoder = { NULL, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif @@ -474,7 +474,7 @@ AVCodec pbm_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif // CONFIG_PBM_ENCODER @@ -490,7 +490,7 @@ AVCodec pam_decoder = { NULL, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif @@ -503,7 +503,7 @@ AVCodec pam_encoder = { sizeof(PNMContext), common_init, pam_encode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif // CONFIG_PAM_ENCODER diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 945111a931..eb275d46db 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -328,6 +328,6 @@ AVCodec qtrle_encoder = { qtrle_encode_init, qtrle_encode_frame, qtrle_encode_end, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_ARGB, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_ARGB, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), }; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index e7cfcb7036..0f74ddd671 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1069,7 +1069,7 @@ AVCodec roq_encoder = roq_encode_init, roq_encode_frame, roq_encode_end, - .supported_framerates = (AVRational[]){{30,1}, {0,0}}, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV444P, PIX_FMT_NONE}, + .supported_framerates = (const AVRational[]){{30,1}, {0,0}}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV444P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), }; diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 41ccbcafba..db0e6edec4 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -64,6 +64,6 @@ AVCodec rv10_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"), }; diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 3af504d836..fbcbecb051 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -64,6 +64,6 @@ AVCodec rv20_encoder = { MPV_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"), }; diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index b2fd145e20..a206ae562b 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -151,7 +151,7 @@ AVCodec sgi_encoder = { encode_init, encode_frame, NULL, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_GRAY8, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_GRAY8, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("SGI image"), }; diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 3d7749d4e4..1bbda43eb6 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -828,6 +828,6 @@ AVCodec svq1_decoder = { svq1_decode_frame, CODEC_CAP_DR1, .flush= ff_mpeg_flush, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1"), }; diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 357f39d887..ce46816c16 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -589,6 +589,6 @@ AVCodec svq1_encoder = { svq1_encode_init, svq1_encode_frame, svq1_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1"), }; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index fc35b5f817..87176479b2 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1062,5 +1062,5 @@ AVCodec svq3_decoder = { svq3_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_DELAY, .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3"), - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_NONE}, }; diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 21747bb368..b24c6f3ee2 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -157,6 +157,6 @@ AVCodec targa_encoder = { .priv_data_size = sizeof(TargaContext), .init = targa_encode_init, .encode = targa_encode_frame, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 3d0619620b..7af39142c9 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -452,7 +452,7 @@ AVCodec tiff_encoder = { 0, NULL, .pix_fmts = - (enum PixelFormat[]) {PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8, + (const enum PixelFormat[]) {PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_MONOWHITE, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_YUV410P, diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index f69854efd4..f1fb8d2884 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -125,6 +125,6 @@ AVCodec v210_encoder = { encode_init, encode_frame, encode_close, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV422P16, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P16, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 998428d1a9..0a59bd2fd7 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -3363,7 +3363,7 @@ AVCodec wmv3_vdpau_decoder = { CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, NULL, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"), - .pix_fmts = (enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE} + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE} }; #endif @@ -3380,6 +3380,6 @@ AVCodec vc1_vdpau_decoder = { CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, NULL, .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"), - .pix_fmts = (enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE} + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE} }; #endif diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index c17a97305c..7143643594 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -218,6 +218,6 @@ AVCodec wmv2_encoder = { wmv2_encode_init, MPV_encode_picture, MPV_encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 8"), }; diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 21882d503f..5a1428e4a8 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -330,6 +330,6 @@ AVCodec zmbv_encoder = { encode_init, encode_frame, encode_end, - .pix_fmts = (enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), }; -- cgit v1.2.3