# HG changeset patch # User reimar # Date 1252253361 0 # Node ID 38cfe222e1a4b80e121e3248abe7f253ee18845d # Parent 7955db35570372b22261271e8c77ef5a0050867e 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. diff -r 7955db355703 -r 38cfe222e1a4 asv1.c --- a/asv1.c Sun Sep 06 09:15:07 2009 +0000 +++ b/asv1.c Sun Sep 06 16:09:21 2009 +0000 @@ -645,7 +645,7 @@ 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 @@ 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 -r 7955db355703 -r 38cfe222e1a4 bmpenc.c --- a/bmpenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/bmpenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -139,7 +139,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 dnxhdenc.c --- a/dnxhdenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/dnxhdenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -804,6 +804,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 dv.c --- a/dv.c Sun Sep 06 09:15:07 2009 +0000 +++ b/dv.c Sun Sep 06 16:09:21 2009 +0000 @@ -1324,7 +1324,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 ffv1.c --- a/ffv1.c Sun Sep 06 09:15:07 2009 +0000 +++ b/ffv1.c Sun Sep 06 16:09:21 2009 +0000 @@ -1147,7 +1147,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 flashsv.c --- a/flashsv.c Sun Sep 06 09:15:07 2009 +0000 +++ b/flashsv.c Sun Sep 06 16:09:21 2009 +0000 @@ -256,6 +256,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 flashsvenc.c --- a/flashsvenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/flashsvenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -292,7 +292,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 gif.c --- a/gif.c Sun Sep 06 09:15:07 2009 +0000 +++ b/gif.c Sun Sep 06 16:09:21 2009 +0000 @@ -174,6 +174,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 h261enc.c --- a/h261enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/h261enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -328,7 +328,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 huffyuv.c --- a/huffyuv.c Sun Sep 06 09:15:07 2009 +0000 +++ b/huffyuv.c Sun Sep 06 16:09:21 2009 +0000 @@ -1487,7 +1487,7 @@ 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 @@ 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 -r 7955db355703 -r 38cfe222e1a4 jpeglsenc.c --- a/jpeglsenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/jpeglsenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -390,6 +390,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 libdiracenc.c --- a/libdiracenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/libdiracenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -400,6 +400,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 libschroedingerenc.c --- a/libschroedingerenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/libschroedingerenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -414,6 +414,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 libx264.c --- a/libx264.c Sun Sep 06 09:15:07 2009 +0000 +++ b/libx264.c Sun Sep 06 16:09:21 2009 +0000 @@ -320,6 +320,6 @@ .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 -r 7955db355703 -r 38cfe222e1a4 libxvidff.c --- a/libxvidff.c Sun Sep 06 09:15:07 2009 +0000 +++ b/libxvidff.c Sun Sep 06 16:09:21 2009 +0000 @@ -775,6 +775,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 mjpegenc.c --- a/mjpegenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/mjpegenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -454,6 +454,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 mpeg12enc.c --- a/mpeg12enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/mpeg12enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -934,7 +934,7 @@ 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 @@ 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 -r 7955db355703 -r 38cfe222e1a4 mpegvideo_enc.c --- a/mpegvideo_enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/mpegvideo_enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -3730,7 +3730,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 -r 7955db355703 -r 38cfe222e1a4 pcxenc.c --- a/pcxenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/pcxenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -197,7 +197,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 pngenc.c --- a/pngenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/pngenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -444,6 +444,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 pnmenc.c --- a/pnmenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/pnmenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -374,7 +374,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 -r 7955db355703 -r 38cfe222e1a4 qtrleenc.c --- a/qtrleenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/qtrleenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -328,6 +328,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 roqvideoenc.c --- a/roqvideoenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/roqvideoenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -1069,7 +1069,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 rv10enc.c --- a/rv10enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/rv10enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -64,6 +64,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 rv20enc.c --- a/rv20enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/rv20enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -64,6 +64,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 sgienc.c --- a/sgienc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/sgienc.c Sun Sep 06 16:09:21 2009 +0000 @@ -151,7 +151,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 svq1dec.c --- a/svq1dec.c Sun Sep 06 09:15:07 2009 +0000 +++ b/svq1dec.c Sun Sep 06 16:09:21 2009 +0000 @@ -828,6 +828,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 svq1enc.c --- a/svq1enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/svq1enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -589,6 +589,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 svq3.c --- a/svq3.c Sun Sep 06 09:15:07 2009 +0000 +++ b/svq3.c Sun Sep 06 16:09:21 2009 +0000 @@ -1062,5 +1062,5 @@ 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 -r 7955db355703 -r 38cfe222e1a4 targaenc.c --- a/targaenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/targaenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -157,6 +157,6 @@ .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 -r 7955db355703 -r 38cfe222e1a4 tiffenc.c --- a/tiffenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/tiffenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -452,7 +452,7 @@ 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 -r 7955db355703 -r 38cfe222e1a4 v210enc.c --- a/v210enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/v210enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -125,6 +125,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 vc1dec.c --- a/vc1dec.c Sun Sep 06 09:15:07 2009 +0000 +++ b/vc1dec.c Sun Sep 06 16:09:21 2009 +0000 @@ -3363,7 +3363,7 @@ 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 @@ 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 -r 7955db355703 -r 38cfe222e1a4 wmv2enc.c --- a/wmv2enc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/wmv2enc.c Sun Sep 06 16:09:21 2009 +0000 @@ -218,6 +218,6 @@ 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 -r 7955db355703 -r 38cfe222e1a4 zmbvenc.c --- a/zmbvenc.c Sun Sep 06 09:15:07 2009 +0000 +++ b/zmbvenc.c Sun Sep 06 16:09:21 2009 +0000 @@ -330,6 +330,6 @@ 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"), };