diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-17 12:54:31 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-07-29 08:42:34 +0200 |
| commit | ec6402b7c595c3ceed6d1b8c1b75c6aa8336e052 (patch) | |
| tree | b0ac16ae01c2bb355766ae164a1b44fc88617750 /libavcodec/pnmenc.c | |
| parent | 3ad168412600e16dfaa4b41b21322a82a8535990 (diff) | |
| download | ffmpeg-ec6402b7c595c3ceed6d1b8c1b75c6aa8336e052.tar.gz | |
lavc: use designated initialisers for all codecs.
It's more readable and less prone to breakage.
Diffstat (limited to 'libavcodec/pnmenc.c')
| -rw-r--r-- | libavcodec/pnmenc.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 57cb90c868..a27a278d47 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -114,12 +114,12 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, #if CONFIG_PGM_ENCODER AVCodec ff_pgm_encoder = { - "pgm", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_PGM, - sizeof(PNMContext), - ff_pnm_init, - pnm_encode_frame, + .name = "pgm", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_PGM, + .priv_data_size = sizeof(PNMContext), + .init = ff_pnm_init, + .encode = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; @@ -127,12 +127,12 @@ AVCodec ff_pgm_encoder = { #if CONFIG_PGMYUV_ENCODER AVCodec ff_pgmyuv_encoder = { - "pgmyuv", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_PGMYUV, - sizeof(PNMContext), - ff_pnm_init, - pnm_encode_frame, + .name = "pgmyuv", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_PGMYUV, + .priv_data_size = sizeof(PNMContext), + .init = ff_pnm_init, + .encode = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; @@ -140,12 +140,12 @@ AVCodec ff_pgmyuv_encoder = { #if CONFIG_PPM_ENCODER AVCodec ff_ppm_encoder = { - "ppm", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_PPM, - sizeof(PNMContext), - ff_pnm_init, - pnm_encode_frame, + .name = "ppm", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_PPM, + .priv_data_size = sizeof(PNMContext), + .init = ff_pnm_init, + .encode = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; @@ -153,12 +153,12 @@ AVCodec ff_ppm_encoder = { #if CONFIG_PBM_ENCODER AVCodec ff_pbm_encoder = { - "pbm", - AVMEDIA_TYPE_VIDEO, - CODEC_ID_PBM, - sizeof(PNMContext), - ff_pnm_init, - pnm_encode_frame, + .name = "pbm", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_PBM, + .priv_data_size = sizeof(PNMContext), + .init = ff_pnm_init, + .encode = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; |