diff options
| author | Martin Storsjö <martin@martin.st> | 2012-04-06 19:19:39 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-04-06 22:37:38 +0300 |
| commit | 00c3b67b8ac6bfdc5a01535173dc537824a53d6e (patch) | |
| tree | 5e792eb0a8fa6cc4f1b1c039b12e733309dfc7d4 | |
| parent | 6d27d8b1dddc779d5800ace3f96697c91eca51dd (diff) | |
| download | ffmpeg-00c3b67b8ac6bfdc5a01535173dc537824a53d6e.tar.gz | |
cosmetics: Align codec declarations
Also break some long lines, remove codec function placeholder comments
and add spaces in sample/pixel format lists.
Signed-off-by: Martin Storsjö <martin@martin.st>
200 files changed, 731 insertions, 638 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 90840b5e87..e7c9423e4a 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2773,18 +2773,18 @@ static av_cold int latm_decode_init(AVCodecContext *avctx) AVCodec ff_aac_decoder = { - .name = "aac", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_AAC, - .priv_data_size = sizeof(AACContext), - .init = aac_decode_init, - .close = aac_decode_close, - .decode = aac_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), - .sample_fmts = (const enum AVSampleFormat[]) { + .name = "aac", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_AAC, + .priv_data_size = sizeof(AACContext), + .init = aac_decode_init, + .close = aac_decode_close, + .decode = aac_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1, + .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1, .channel_layouts = aac_channel_layout, }; @@ -2794,17 +2794,17 @@ AVCodec ff_aac_decoder = { To do a more complex LATM demuxing a separate LATM demuxer should be used. */ AVCodec ff_aac_latm_decoder = { - .name = "aac_latm", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_AAC_LATM, - .priv_data_size = sizeof(struct LATMContext), - .init = latm_decode_init, - .close = aac_decode_close, - .decode = latm_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Codec LATM syntax)"), - .sample_fmts = (const enum AVSampleFormat[]) { + .name = "aac_latm", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_AAC_LATM, + .priv_data_size = sizeof(struct LATMContext), + .init = latm_decode_init, + .close = aac_decode_close, + .decode = latm_decode_frame, + .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Codec LATM syntax)"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, - .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1, + .capabilities = CODEC_CAP_CHANNEL_CONF | CODEC_CAP_DR1, .channel_layouts = aac_channel_layout, }; diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index bc99a443b3..503a4a5f40 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -817,8 +817,10 @@ AVCodec ff_aac_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_end, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), - .priv_class = &aacenc_class, + .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | + CODEC_CAP_EXPERIMENTAL, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), + .priv_class = &aacenc_class, }; diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 11ea5779b1..3cec079a34 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -118,5 +118,5 @@ AVCodec ff_aasc_decoder = { .close = aasc_decode_end, .decode = aasc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), + .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), }; diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index 140d4873ed..8d75ee303b 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -141,16 +141,17 @@ static av_cold int ac3_fixed_encode_init(AVCodecContext *avctx) AVCodec ff_ac3_fixed_encoder = { - .name = "ac3_fixed", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_AC3, - .priv_data_size = sizeof(AC3EncodeContext), - .init = ac3_fixed_encode_init, - .encode2 = ff_ac3_fixed_encode_frame, - .close = ff_ac3_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), - .priv_class = &ac3enc_class, + .name = "ac3_fixed", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_AC3, + .priv_data_size = sizeof(AC3EncodeContext), + .init = ac3_fixed_encode_init, + .encode2 = ff_ac3_fixed_encode_frame, + .close = ff_ac3_encode_close, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + .priv_class = &ac3enc_class, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index f64019778b..0b9e1de298 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -139,16 +139,17 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl) #if CONFIG_AC3_ENCODER AVCodec ff_ac3_encoder = { - .name = "ac3", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_AC3, - .priv_data_size = sizeof(AC3EncodeContext), - .init = ff_ac3_encode_init, - .encode2 = ff_ac3_float_encode_frame, - .close = ff_ac3_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), - .priv_class = &ac3enc_class, + .name = "ac3", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_AC3, + .priv_data_size = sizeof(AC3EncodeContext), + .init = ff_ac3_encode_init, + .encode2 = ff_ac3_float_encode_frame, + .close = ff_ac3_encode_close, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), + .priv_class = &ac3enc_class, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index b880ebf9de..73c54030b7 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -726,8 +726,8 @@ AVCodec ff_ ## name_ ## _encoder = { \ .init = adpcm_encode_init, \ .encode2 = adpcm_encode_frame, \ .close = adpcm_encode_close, \ - .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, \ - AV_SAMPLE_FMT_NONE}, \ + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, \ + AV_SAMPLE_FMT_NONE }, \ .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ } diff --git a/libavcodec/alac.c b/libavcodec/alac.c index e2ec6a48b4..ab9fb81d87 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -661,5 +661,5 @@ AVCodec ff_alac_decoder = { .close = alac_decode_close, .decode = alac_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), + .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), }; diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 35952ae21f..3d4f2bdd70 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -1745,7 +1745,7 @@ AVCodec ff_als_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .flush = flush, - .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), + .flush = flush, + .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"), }; diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index 0eeda6d843..ab721ea239 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -1063,5 +1063,6 @@ AVCodec ff_amrnb_decoder = { .decode = amrnb_decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"), - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 8bbc31c9bd..ed60529504 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1243,5 +1243,6 @@ AVCodec ff_amrwb_decoder = { .decode = amrwb_decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"), - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/anm.c b/libavcodec/anm.c index c2d22cb366..831cdfb9ac 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -191,5 +191,5 @@ AVCodec ff_anm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), + .long_name = NULL_IF_CONFIG_SMALL("Deluxe Paint Animation"), }; diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 1f982670f4..e41f555e31 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -993,7 +993,7 @@ AVCodec ff_ape_decoder = { .close = ape_decode_close, .decode = ape_decode_frame, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1, - .flush = ape_flush, - .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), + .flush = ape_flush, + .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), .priv_class = &ape_decoder_class, }; diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index 8dfe276f93..6c8bed3043 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -626,7 +626,7 @@ AVCodec ff_asv1_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"), + .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), }; AVCodec ff_asv2_decoder = { @@ -638,7 +638,7 @@ AVCodec ff_asv2_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), + .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), }; #if CONFIG_ASV1_ENCODER @@ -649,9 +649,8 @@ AVCodec ff_asv1_encoder = { .priv_data_size = sizeof(ASV1Context), .init = encode_init, .encode2 = encode_frame, - //encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), }; #endif @@ -663,8 +662,7 @@ AVCodec ff_asv2_encoder = { .priv_data_size = sizeof(ASV1Context), .init = encode_init, .encode2 = encode_frame, - //encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), }; #endif diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 1afd62680a..d0b58704f6 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -401,13 +401,13 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx) AVCodec ff_atrac1_decoder = { - .name = "atrac1", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_ATRAC1, + .name = "atrac1", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_ATRAC1, .priv_data_size = sizeof(AT1Ctx), - .init = atrac1_decode_init, - .close = atrac1_decode_end, - .decode = atrac1_decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"), + .init = atrac1_decode_init, + .close = atrac1_decode_end, + .decode = atrac1_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Atrac 1 (Adaptive TRansform Acoustic Coding)"), }; diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 136b16c36d..f468f11065 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -1066,13 +1066,13 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) AVCodec ff_atrac3_decoder = { - .name = "atrac3", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_ATRAC3, + .name = "atrac3", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_ATRAC3, .priv_data_size = sizeof(ATRAC3Context), - .init = atrac3_decode_init, - .close = atrac3_decode_close, - .decode = atrac3_decode_frame, - .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), + .init = atrac3_decode_init, + .close = atrac3_decode_close, + .decode = atrac3_decode_frame, + .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), }; diff --git a/libavcodec/aura.c b/libavcodec/aura.c index 6052a65acf..d17fc97280 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -131,5 +131,5 @@ AVCodec ff_aura2_decoder = { .close = aura_decode_end, .decode = aura_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), + .long_name = NULL_IF_CONFIG_SMALL("Auravision Aura 2"), }; diff --git a/libavcodec/avs.c b/libavcodec/avs.c index f4d8f69610..7f8ff0f024 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -179,5 +179,5 @@ AVCodec ff_avs_decoder = { .decode = avs_decode_frame, .close = avs_decode_end, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), + .long_name = NULL_IF_CONFIG_SMALL("AVS (Audio Video Standard) video"), }; diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index c57aa9fb03..406fa6c7a0 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -151,13 +151,13 @@ static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx) } AVCodec ff_bethsoftvid_decoder = { - .name = "bethsoftvid", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_BETHSOFTVID, + .name = "bethsoftvid", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_BETHSOFTVID, .priv_data_size = sizeof(BethsoftvidContext), - .init = bethsoftvid_decode_init, - .close = bethsoftvid_decode_end, - .decode = bethsoftvid_decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), + .init = bethsoftvid_decode_init, + .close = bethsoftvid_decode_end, + .decode = bethsoftvid_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), }; diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 542ba5421c..bc680c0d39 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -184,13 +184,13 @@ static av_cold int bfi_decode_close(AVCodecContext * avctx) } AVCodec ff_bfi_decoder = { - .name = "bfi", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_BFI, + .name = "bfi", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_BFI, .priv_data_size = sizeof(BFIContext), - .init = bfi_decode_init, - .close = bfi_decode_close, - .decode = bfi_decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), + .init = bfi_decode_init, + .close = bfi_decode_close, + .decode = bfi_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), }; diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 47f4b72733..2bde59bcdc 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -1335,5 +1335,5 @@ AVCodec ff_bink_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Bink video"), + .long_name = NULL_IF_CONFIG_SMALL("Bink video"), }; diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 18bb87b95e..d77018c1f6 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -367,7 +367,7 @@ AVCodec ff_binkaudio_rdft_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)") + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)") }; AVCodec ff_binkaudio_dct_decoder = { @@ -379,5 +379,5 @@ AVCodec ff_binkaudio_dct_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)") + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)") }; diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 4d586dc89b..5528932878 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -368,5 +368,5 @@ AVCodec ff_bmp_decoder = { .close = bmp_decode_end, .decode = bmp_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("BMP image"), + .long_name = NULL_IF_CONFIG_SMALL("BMP image"), }; diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 0bbbb61315..6d24cacb1c 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -166,11 +166,12 @@ AVCodec ff_bmp_encoder = { .priv_data_size = sizeof(BMPContext), .init = bmp_encode_init, .encode2 = bmp_encode_frame, - .pix_fmts = (const enum PixelFormat[]){ + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_RGB444, PIX_FMT_RGB565, PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8, PIX_FMT_MONOBLACK, - PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("BMP image"), + PIX_FMT_NONE + }, + .long_name = NULL_IF_CONFIG_SMALL("BMP image"), }; diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 5990529112..589b123191 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -253,5 +253,5 @@ AVCodec ff_c93_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), + .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), }; diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index e3201343be..9f91d0b8ca 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -724,6 +724,6 @@ AVCodec ff_cavs_decoder = { .close = ff_cavs_end, .decode = cavs_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .flush= cavs_flush, - .long_name= NULL_IF_CONFIG_SMALL("Chinese AVS video (AVS1-P2, JiZhun profile)"), + .flush = cavs_flush, + .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS video (AVS1-P2, JiZhun profile)"), }; diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index f1f474f3de..f2f9900d19 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -376,5 +376,5 @@ AVCodec ff_cdgraphics_decoder = { .close = cdg_decode_end, .decode = cdg_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"), + .long_name = NULL_IF_CONFIG_SMALL("CD Graphics video"), }; diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 08ab05f8bb..253384e694 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -475,5 +475,5 @@ AVCodec ff_cinepak_decoder = { .close = cinepak_decode_end, .decode = cinepak_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Cinepak"), + .long_name = NULL_IF_CONFIG_SMALL("Cinepak"), }; diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 17f487842d..1a0f22e938 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -263,5 +263,5 @@ AVCodec ff_cscd_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), + .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), }; diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 60cce82fee..5bfeef0014 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -187,7 +187,7 @@ AVCodec ff_aura_decoder = { .close = cyuv_decode_end, .decode = cyuv_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), + .long_name = NULL_IF_CONFIG_SMALL("Auravision AURA"), }; #endif @@ -201,6 +201,6 @@ AVCodec ff_cyuv_decoder = { .close = cyuv_decode_end, .decode = cyuv_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), + .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), }; #endif diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index 05bc92f1d8..788e9ca90a 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -377,5 +377,5 @@ AVCodec ff_dfa_decoder = { .close = dfa_decode_end, .decode = dfa_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), + .long_name = NULL_IF_CONFIG_SMALL("Chronomaster DFA"), }; diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index cc248eff09..c61e2df1f8 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -406,5 +406,5 @@ AVCodec ff_dnxhd_decoder = { .close = dnxhd_decode_close, .decode = dnxhd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), }; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 10f3e8db9f..d92ea1bd7a 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -1006,8 +1006,10 @@ AVCodec ff_dnxhd_encoder = { .init = dnxhd_encode_init, .encode2 = dnxhd_encode_picture, .close = dnxhd_encode_end, - .capabilities = CODEC_CAP_SLICE_THREADS, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_YUV422P10, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), - .priv_class = &class, + .capabilities = CODEC_CAP_SLICE_THREADS, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV422P, + PIX_FMT_YUV422P10, + PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), + .priv_class = &class, }; diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 156f1deaa4..fadd5c3bae 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -241,5 +241,5 @@ AVCodec ff_dpx_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("DPX image"), + .long_name = NULL_IF_CONFIG_SMALL("DPX image"), }; diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c index a379531613..d3b2cbded6 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -381,7 +381,7 @@ AVCodec ff_dsicinvideo_decoder = { .close = cinvideo_decode_end, .decode = cinvideo_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), }; AVCodec ff_dsicinaudio_decoder = { @@ -392,5 +392,5 @@ AVCodec ff_dsicinaudio_decoder = { .init = cinaudio_decode_init, .decode = cinaudio_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"), + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"), }; diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 83b6960f38..1a0075b57b 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -959,8 +959,10 @@ AVCodec ff_dvvideo_encoder = { .priv_data_size = sizeof(DVVideoContext), .init = dvvideo_init_encoder, .encode2 = dvvideo_encode_frame, - .capabilities = CODEC_CAP_SLICE_THREADS, - .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)"), + .capabilities = CODEC_CAP_SLICE_THREADS, + .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/dvbsub.c b/libavcodec/dvbsub.c index 4788d50cfe..49bad217d9 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -408,5 +408,5 @@ AVCodec ff_dvbsub_encoder = { .id = CODEC_ID_DVB_SUBTITLE, .priv_data_size = sizeof(DVBSubtitleContext), .encode = dvbsub_encode, - .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), }; diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 34c247c910..cc14622c30 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1471,5 +1471,5 @@ AVCodec ff_dvbsub_decoder = { .init = dvbsub_init_decoder, .close = dvbsub_close_decoder, .decode = dvbsub_decode, - .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), }; diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index aeea01076e..8f52959e0c 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -380,6 +380,6 @@ AVCodec ff_dvvideo_decoder = { .close = dvvideo_close, .decode = dvvideo_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), }; diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 83e71d1238..78203d0026 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -489,5 +489,5 @@ AVCodec ff_dvdsub_decoder = { .type = AVMEDIA_TYPE_SUBTITLE, .id = CODEC_ID_DVD_SUBTITLE, .decode = dvdsub_decode, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), }; diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index 82d0608664..bf0ae61ed2 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -220,5 +220,5 @@ AVCodec ff_dvdsub_encoder = { .type = AVMEDIA_TYPE_SUBTITLE, .id = CODEC_ID_DVD_SUBTITLE, .encode = dvdsub_encode, - .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), }; diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 7b7a386adc..2684179981 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -324,5 +324,5 @@ AVCodec ff_dxa_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), + .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), }; diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index eb35211c73..409d581eda 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -254,7 +254,8 @@ AVCodec ff_eac3_encoder = { .init = ff_ac3_encode_init, .encode2 = ff_ac3_float_encode_frame, .close = ff_ac3_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), .priv_class = &eac3enc_class, .channel_layouts = ff_ac3_channel_layouts, diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 085e2d8177..542a016ebe 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -217,5 +217,5 @@ AVCodec ff_eacmv_decoder = { .close = cmv_decode_end, .decode = cmv_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"), + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"), }; diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 54a93926d2..1daef7e673 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -315,5 +315,5 @@ AVCodec ff_eamad_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video") + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Madcow Video") }; diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index b177db57f2..e53b99205b 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -252,5 +252,5 @@ AVCodec ff_eatgq_decoder = { .close = tgq_decode_end, .decode = tgq_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"), + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGQ video"), }; diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 025188bc89..34b79af5ae 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -342,5 +342,5 @@ AVCodec ff_eatgv_decoder = { .init = tgv_decode_init, .close = tgv_decode_end, .decode = tgv_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TGV video"), }; diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index ca4e98b6bf..2d7da5a603 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -162,5 +162,5 @@ AVCodec ff_eatqi_decoder = { .close = tqi_decode_end, .decode = tqi_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"), + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"), }; diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index a9f083325f..eec7885c7c 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -372,5 +372,5 @@ AVCodec ff_escape124_decoder = { .close = escape124_decode_close, .decode = escape124_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), + .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), }; diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 497c9a17e2..e2ca6fd9d9 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1743,8 +1743,9 @@ AVCodec ff_ffv1_decoder = { .init = decode_init, .close = common_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | CODEC_CAP_SLICE_THREADS, - .long_name= NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), + .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | + CODEC_CAP_SLICE_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg video codec #1"), }; #if CONFIG_FFV1_ENCODER @@ -1756,8 +1757,12 @@ AVCodec ff_ffv1_encoder = { .init = encode_init, .encode2 = encode_frame, .close = common_end, - .capabilities = CODEC_CAP_SLICE_THREADS, - .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"), + .capabilities = CODEC_CAP_SLICE_THREADS, + .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/flacdec.c b/libavcodec/flacdec.c index ad3827b6cc..cd2a69390a 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -689,5 +689,5 @@ AVCodec ff_flac_decoder = { .close = flac_decode_close, .decode = flac_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name= NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), + .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), }; diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 7fd4075c71..fc1f00aad2 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1306,8 +1306,9 @@ AVCodec ff_flac_encoder = { .init = flac_encode_init, .encode2 = flac_encode_frame, .close = flac_encode_close, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), - .priv_class = &flac_encoder_class, + .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), + .priv_class = &flac_encoder_class, }; diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index c99c21c719..c6af3f3aa6 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -461,7 +461,7 @@ AVCodec ff_flashsv_decoder = { .close = flashsv_decode_end, .decode = flashsv_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = (const 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"), }; #endif /* CONFIG_FLASHSV_DECODER */ @@ -524,7 +524,7 @@ AVCodec ff_flashsv2_decoder = { .close = flashsv2_decode_end, .decode = flashsv_decode_frame, .capabilities = CODEC_CAP_DR1, - .pix_fmts = (const 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 v2"), }; #endif /* CONFIG_FLASHSV2_DECODER */ diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 75daf36202..ddbc2a1257 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -287,6 +287,6 @@ AVCodec ff_flashsv_encoder = { .init = flashsv_encode_init, .encode2 = flashsv_encode_frame, .close = flashsv_encode_end, - .pix_fmts = (const 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/flicvideo.c b/libavcodec/flicvideo.c index b7bbfb4f5d..d6c4934e88 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -741,5 +741,5 @@ AVCodec ff_flic_decoder = { .close = flic_decode_end, .decode = flic_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), + .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), }; diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 29d680849d..b4b171f500 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -127,7 +127,7 @@ AVCodec ff_flv_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), - .pix_fmts= ff_pixfmt_list_420, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), + .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index 121aaf548d..b5dfd66898 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -94,7 +94,7 @@ AVCodec ff_flv_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), .priv_class = &flv_class, }; diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index dc74b5112f..6b2c11fe71 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -375,5 +375,5 @@ AVCodec ff_fraps_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Fraps"), + .long_name = NULL_IF_CONFIG_SMALL("Fraps"), }; diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c index 305d0cd6d0..98e4bc1aa9 100644 --- a/libavcodec/frwu.c +++ b/libavcodec/frwu.c @@ -120,5 +120,5 @@ AVCodec ff_frwu_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), + .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"), }; diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index 424dd237dc..ae00cd7731 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -400,5 +400,6 @@ AVCodec ff_adpcm_g722_encoder = { .encode2 = g722_encode_frame, .capabilities = CODEC_CAP_SMALL_LAST_FRAME, .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/g726.c b/libavcodec/g726.c index c989d075eb..83ce0ef083 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -406,9 +406,10 @@ AVCodec ff_adpcm_g726_encoder = { #if FF_API_OLD_ENCODE_AUDIO .close = g726_encode_close, #endif - .capabilities = CODEC_CAP_SMALL_LAST_FRAME, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), + .capabilities = CODEC_CAP_SMALL_LAST_FRAME, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .priv_class = &class, .defaults = defaults, }; @@ -496,6 +497,6 @@ AVCodec ff_adpcm_g726_decoder = { .decode = g726_decode_frame, .flush = g726_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), }; #endif diff --git a/libavcodec/gif.c b/libavcodec/gif.c index d5ceb0d05e..7f602989e2 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -187,6 +187,9 @@ AVCodec ff_gif_encoder = { .init = gif_encode_init, .encode2 = gif_encode_frame, .close = gif_encode_close, - .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)"), + .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/gifdec.c b/libavcodec/gifdec.c index 9bac254c59..d44a535a15 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -334,5 +334,5 @@ AVCodec ff_gif_decoder = { .close = gif_decode_close, .decode = gif_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), + .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), }; diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 97b6fe8492..4d5b4763e3 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -114,7 +114,7 @@ AVCodec ff_gsm_decoder = { .decode = gsm_decode_frame, .flush = gsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("GSM"), + .long_name = NULL_IF_CONFIG_SMALL("GSM"), }; AVCodec ff_gsm_ms_decoder = { @@ -126,5 +126,5 @@ AVCodec ff_gsm_ms_decoder = { .decode = gsm_decode_frame, .flush = gsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), + .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), }; diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 3b44e81654..078682dc5f 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -651,6 +651,6 @@ AVCodec ff_h261_decoder = { .close = h261_decode_end, .decode = h261_decode_frame, .capabilities = CODEC_CAP_DR1, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("H.261"), + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("H.261"), }; diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 1f3cf714f1..2e586ba9bb 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -331,7 +331,7 @@ AVCodec ff_h261_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("H.261"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("H.261"), .priv_class = &h261_class, }; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 5f35bf8852..be4083f64f 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -742,9 +742,10 @@ AVCodec ff_h263_decoder = { .init = ff_h263_decode_init, .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, - .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, - .flush= ff_mpeg_flush, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), - .pix_fmts= ff_hwaccel_pixfmt_list_420, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, + .flush = ff_mpeg_flush, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), + .pix_fmts = ff_hwaccel_pixfmt_list_420, }; diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 278948d195..943e48c569 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -1449,31 +1449,33 @@ static av_cold int encode_end(AVCodecContext *avctx) #if CONFIG_HUFFYUV_DECODER AVCodec ff_huffyuv_decoder = { - .name = "huffyuv", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_HUFFYUV, - .priv_data_size = sizeof(HYuvContext), - .init = decode_init, - .close = decode_end, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, + .name = "huffyuv", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_HUFFYUV, + .priv_data_size = sizeof(HYuvContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | + CODEC_CAP_FRAME_THREADS, .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; #endif #if CONFIG_FFVHUFF_DECODER AVCodec ff_ffvhuff_decoder = { - .name = "ffvhuff", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_FFVHUFF, - .priv_data_size = sizeof(HYuvContext), - .init = decode_init, - .close = decode_end, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, + .name = "ffvhuff", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_FFVHUFF, + .priv_data_size = sizeof(HYuvContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | + CODEC_CAP_FRAME_THREADS, .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif @@ -1486,8 +1488,10 @@ AVCodec ff_huffyuv_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), + .pix_fmts = (const enum PixelFormat[]){ + PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE + }, + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; #endif @@ -1500,7 +1504,9 @@ AVCodec ff_ffvhuff_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .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"), + .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/idcinvideo.c b/libavcodec/idcinvideo.c index e1b0e2e3e9..c936ebbcc3 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -262,5 +262,5 @@ AVCodec ff_idcin_decoder = { .close = idcin_decode_end, .decode = idcin_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), + .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), }; diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 41e7b5939f..c17850f850 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -376,7 +376,7 @@ AVCodec ff_iff_ilbm_decoder = { .close = decode_end, .decode = decode_frame_ilbm, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), + .long_name = NULL_IF_CONFIG_SMALL("IFF ILBM"), }; AVCodec ff_iff_byterun1_decoder = { @@ -388,5 +388,5 @@ AVCodec ff_iff_byterun1_decoder = { .close = decode_end, .decode = decode_frame_byterun1, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), + .long_name = NULL_IF_CONFIG_SMALL("IFF ByteRun1"), }; diff --git a/libavcodec/imc.c b/libavcodec/imc.c index cfed7c4712..2c9efb9b12 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -846,13 +846,13 @@ static av_cold int imc_decode_close(AVCodecContext * avctx) AVCodec ff_imc_decoder = { - .name = "imc", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_IMC, + .name = "imc", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_IMC, .priv_data_size = sizeof(IMCContext), - .init = imc_decode_init, - .close = imc_decode_close, - .decode = imc_decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), + .init = imc_decode_init, + .close = imc_decode_close, + .decode = imc_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), }; diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 6761c59eed..46d1cc5c74 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -239,5 +239,5 @@ AVCodec ff_indeo2_decoder = { .close = ir2_decode_end, .decode = ir2_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), }; diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 250ac6945c..4f983ab727 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -133,6 +133,6 @@ AVCodec ff_h263i_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), - .pix_fmts= ff_pixfmt_list_420, + .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), + .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 256b6c65b1..4732bf5325 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -1022,5 +1022,5 @@ AVCodec ff_interplay_video_decoder = { .close = ipvideo_decode_end, .decode = ipvideo_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE, - .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), + .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE video"), }; diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index a4cfe4f9d6..43bf7652b7 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -372,5 +372,5 @@ AVCodec ff_jpegls_decoder = { .close = ff_mjpeg_decode_end, .decode = ff_mjpeg_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), + .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), }; diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 2606706bbc..805c48e507 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -399,6 +399,9 @@ AVCodec ff_jpegls_encoder = { //FIXME avoid MPV_* lossless JPEG should not need .priv_data_size = sizeof(JpeglsContext), .init = encode_init_ls, .encode2 = encode_picture_ls, - .pix_fmts = (const 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/kgv1dec.c b/libavcodec/kgv1dec.c index 42bbcae530..2fd6bbcdd6 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -189,5 +189,5 @@ AVCodec ff_kgv1_decoder = { .close = decode_end, .decode = decode_frame, .flush = decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), + .long_name = NULL_IF_CONFIG_SMALL("Kega Game Video"), }; diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index f862154b05..8727883704 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -428,5 +428,5 @@ AVCodec ff_kmvc_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), + .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), }; diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 201f77dda3..d6921ea4eb 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -624,5 +624,5 @@ AVCodec ff_lagarith_decoder = { .close = lag_decode_end, .decode = lag_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"), + .long_name = NULL_IF_CONFIG_SMALL("Lagarith lossless"), }; diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index b486ea037c..0b08900f5d 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -644,7 +644,7 @@ AVCodec ff_mszh_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), }; #endif @@ -658,6 +658,6 @@ AVCodec ff_zlib_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), }; #endif diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c index eacd3228f5..9906fd11f2 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -190,6 +190,6 @@ AVCodec ff_zlib_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_BGR24, PIX_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), + .pix_fmts = (const enum PixelFormat[]) { PIX_FMT_BGR24, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), }; diff --git a/libavcodec/libdiracdec.c b/libavcodec/libdiracdec.c index 65651711b1..cbd29850f3 100644 --- a/libavcodec/libdiracdec.c +++ b/libavcodec/libdiracdec.c @@ -203,6 +203,6 @@ AVCodec ff_libdirac_decoder = { .close = libdirac_decode_close, .decode = libdirac_decode_frame, .capabilities = CODEC_CAP_DELAY, - .flush = libdirac_flush, - .long_name = NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"), + .flush = libdirac_flush, + .long_name = NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"), }; diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index 6a74465e9d..bb19083142 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -222,8 +222,9 @@ AVCodec ff_libfaac_encoder = { .init = Faac_encode_init, .encode2 = Faac_encode_frame, .close = Faac_encode_close, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"), - .profiles = NULL_IF_CONFIG_SMALL(profiles), + .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"), + .profiles = NULL_IF_CONFIG_SMALL(profiles), }; diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 8b0a13ba1a..5e5d9d6a5c 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -123,8 +123,9 @@ AVCodec ff_libgsm_encoder = { .init = libgsm_encode_init, .encode2 = libgsm_encode_frame, .close = libgsm_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), }; AVCodec ff_libgsm_ms_encoder = { @@ -134,8 +135,9 @@ AVCodec ff_libgsm_ms_encoder = { .init = libgsm_encode_init, .encode2 = libgsm_encode_frame, .close = libgsm_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), }; typedef struct LibGSMDecodeContext { @@ -244,7 +246,7 @@ AVCodec ff_libgsm_decoder = { .decode = libgsm_decode_frame, .flush = libgsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), }; AVCodec ff_libgsm_ms_decoder = { @@ -257,5 +259,5 @@ AVCodec ff_libgsm_ms_decoder = { .decode = libgsm_decode_frame, .flush = libgsm_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), }; diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index d5b64e5260..35feca5369 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -180,7 +180,7 @@ AVCodec ff_libopencore_amrnb_decoder = { .close = amr_nb_decode_close, .decode = amr_nb_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"), + .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"), }; static av_cold int amr_nb_encode_init(AVCodecContext *avctx) @@ -297,9 +297,10 @@ AVCodec ff_libopencore_amrnb_encoder = { .encode2 = amr_nb_encode_frame, .close = amr_nb_encode_close, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"), - .priv_class = &class, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"), + .priv_class = &class, }; #endif @@ -385,7 +386,7 @@ AVCodec ff_libopencore_amrwb_decoder = { .close = amr_wb_decode_close, .decode = amr_wb_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Wide-Band"), + .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Wide-Band"), }; #endif /* CONFIG_LIBOPENCORE_AMRWB */ diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c index 1facd21044..3ea6203ad2 100644 --- a/libavcodec/libopenjpeg.c +++ b/libavcodec/libopenjpeg.c @@ -211,15 +211,15 @@ static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx) AVCodec ff_libopenjpeg_decoder = { - .name = "libopenjpeg", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_JPEG2000, - .priv_data_size = sizeof(LibOpenJPEGContext), - .init = libopenjpeg_decode_init, - .close = libopenjpeg_decode_close, - .decode = libopenjpeg_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .max_lowres = 5, - .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"), - .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy) + .name = "libopenjpeg", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_JPEG2000, + .priv_data_size = sizeof(LibOpenJPEGContext), + .init = libopenjpeg_decode_init, + .close = libopenjpeg_decode_close, + .decode = libopenjpeg_decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .max_lowres = 5, + .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"), + .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy), }; diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 184e8cb42b..f573d8a1e6 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -353,6 +353,6 @@ AVCodec ff_libschroedinger_decoder = { .close = libschroedinger_decode_close, .decode = libschroedinger_decode_frame, .capabilities = CODEC_CAP_DELAY, - .flush = libschroedinger_flush, - .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), + .flush = libschroedinger_flush, + .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), }; diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index ed017a1a1f..f07c83e105 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -448,7 +448,9 @@ AVCodec ff_libschroedinger_encoder = { .init = libschroedinger_encode_init, .encode2 = libschroedinger_encode_frame, .close = libschroedinger_encode_close, - .capabilities = CODEC_CAP_DELAY, - .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"), + .capabilities = CODEC_CAP_DELAY, + .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/libspeexdec.c b/libavcodec/libspeexdec.c index 686c9e8142..5730632055 100644 --- a/libavcodec/libspeexdec.c +++ b/libavcodec/libspeexdec.c @@ -168,5 +168,5 @@ AVCodec ff_libspeex_decoder = { .decode = libspeex_decode_frame, .flush = libspeex_decode_flush, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), + .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), }; diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 2c067624c5..faf470eb6c 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -332,7 +332,8 @@ AVCodec ff_libspeex_encoder = { .encode2 = encode_frame, .close = encode_close, .capabilities = CODEC_CAP_DELAY, - .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"), .priv_class = &class, .defaults = defaults, diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index 957994a44f..769b9a56a8 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -361,14 +361,16 @@ static av_cold int encode_close(AVCodecContext* avc_context) /** AVCodec struct exposed to libavcodec */ AVCodec ff_libtheora_encoder = { - .name = "libtheora", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_THEORA, + .name = "libtheora", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_THEORA, .priv_data_size = sizeof(TheoraContext), - .init = encode_init, - .close = encode_close, - .encode2 = encode_frame, - .capabilities = CODEC_CAP_DELAY, // needed to get the statsfile summary - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"), + .init = encode_init, + .close = encode_close, + .encode2 = encode_frame, + .capabilities = CODEC_CAP_DELAY, // needed to get the statsfile summary + .pix_fmts = (const enum PixelFormat[]){ + PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE + }, + .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"), }; diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index f29d065b7b..66ef5cdf2b 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -196,6 +196,7 @@ AVCodec ff_libvo_aacenc_encoder = { .encode2 = aac_encode_frame, .close = aac_encode_close, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"), + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"), }; diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c index 75ec874839..fb712a8edd 100644 --- a/libavcodec/libvo-amrwbenc.c +++ b/libavcodec/libvo-amrwbenc.c @@ -148,8 +148,9 @@ AVCodec ff_libvo_amrwbenc_encoder = { .init = amr_wb_encode_init, .encode2 = amr_wb_encode_frame, .close = amr_wb_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate " - "(AMR) Wide-Band"), - .priv_class = &class, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive " + "Multi-Rate (AMR) Wide-Band"), + .priv_class = &class, }; diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 4a240e5150..7986f6a0e2 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -574,8 +574,8 @@ AVCodec ff_libvpx_encoder = { .encode2 = vp8_encode, .close = vp8_free, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), - .priv_class = &class, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("libvpx VP8"), + .priv_class = &class, .defaults = defaults, }; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index fdde630991..35c003050f 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -546,16 +546,16 @@ static const AVCodecDefault x264_defaults[] = { }; AVCodec ff_libx264_encoder = { - .name = "libx264", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_H264, - .priv_data_size = sizeof(X264Context), - .init = X264_init, - .encode2 = X264_frame, - .close = X264_close, - .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), - .priv_class = &class, - .defaults = x264_defaults, + .name = "libx264", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_H264, + .priv_data_size = sizeof(X264Context), + .init = X264_init, + .encode2 = X264_frame, + .close = X264_close, + .capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), + .priv_class = &class, + .defaults = x264_defaults, .init_static_data = X264_init_static, }; diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index 0193bc8751..b003d7e8e3 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -827,8 +827,8 @@ AVCodec ff_libxvid_encoder = { .init = xvid_encode_init, .encode2 = xvid_encode_frame, .close = xvid_encode_close, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), }; #endif /* CONFIG_LIBXVID_ENCODER */ diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 22b165db53..b86f5fe6a3 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -294,5 +294,5 @@ AVCodec ff_loco_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("LOCO"), + .long_name = NULL_IF_CONFIG_SMALL("LOCO"), }; diff --git a/libavcodec/mace.c b/libavcodec/mace.c index e22bc3976a..e1402c7b9d 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -297,7 +297,7 @@ AVCodec ff_mace3_decoder = { .init = mace_decode_init, .decode = mace_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), + .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), }; AVCodec ff_mace6_decoder = { @@ -308,5 +308,5 @@ AVCodec ff_mace6_decoder = { .init = mace_decode_init, .decode = mace_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), + .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 6:1"), }; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 391cecfb65..cf619c4fe8 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -265,14 +265,14 @@ static av_cold int decode_end(AVCodecContext *avctx){ } AVCodec ff_mdec_decoder = { - .name = "mdec", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MDEC, - .priv_data_size = sizeof(MDECContext), - .init = decode_init, - .close = decode_end, - .decode = decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name= NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), - .init_thread_copy= ONLY_IF_THREADS_ENABLED(decode_init_thread_copy) + .name = "mdec", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MDEC, + .priv_data_size = sizeof(MDECContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), + .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy) }; diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 18f552d90e..4d81a37259 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -421,14 +421,14 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx) } AVCodec ff_mimic_decoder = { - .name = "mimic", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MIMIC, - .priv_data_size = sizeof(MimicContext), - .init = mimic_decode_init, - .close = mimic_decode_end, - .decode = mimic_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("Mimic"), + .name = "mimic", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MIMIC, + .priv_data_size = sizeof(MimicContext), + .init = mimic_decode_init, + .close = mimic_decode_end, + .decode = mimic_decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("Mimic"), .update_thread_context = ONLY_IF_THREADS_ENABLED(mimic_decode_update_thread_context) }; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 10c5addca0..3a2ae13b20 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -161,6 +161,6 @@ AVCodec ff_mjpegb_decoder = { .close = ff_mjpeg_decode_end, .decode = mjpegb_decode_frame, .capabilities = CODEC_CAP_DR1, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), }; diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index bb036ef874..1a559a016f 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -453,6 +453,8 @@ AVCodec ff_mjpeg_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), + .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/mlpdec.c b/libavcodec/mlpdec.c index 91efaf36ab..30310db53a 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1152,7 +1152,7 @@ AVCodec ff_mlp_decoder = { .init = mlp_decode_init, .decode = read_access_unit, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), + .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), }; #if CONFIG_TRUEHD_DECODER @@ -1164,6 +1164,6 @@ AVCodec ff_truehd_decoder = { .init = mlp_decode_init, .decode = read_access_unit, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), + .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), }; #endif /* CONFIG_TRUEHD_DECODER */ diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 501371ad52..6c81fd4ce1 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -235,5 +235,5 @@ AVCodec ff_mmvideo_decoder = { .close = mm_decode_end, .decode = mm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), + .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), }; diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 37c108f1f2..6151e6a114 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -317,5 +317,5 @@ AVCodec ff_motionpixels_decoder = { .close = mp_decode_end, .decode = mp_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"), + .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels video"), }; diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 4e75841008..5d87417b69 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -337,7 +337,7 @@ AVCodec ff_mpc7_decoder = { .init = mpc7_decode_init, .close = mpc7_decode_close, .decode = mpc7_decode_frame, - .flush = mpc7_decode_flush, + .flush = mpc7_decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), }; diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 6d4547be48..f682edbed7 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -427,5 +427,5 @@ AVCodec ff_mpc8_decoder = { .init = mpc8_decode_init, .decode = mpc8_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), }; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 966f2e13fe..27765b32e3 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2491,17 +2491,19 @@ static const AVProfile mpeg2_video_profiles[] = { AVCodec ff_mpeg1video_decoder = { - .name = "mpeg1video", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MPEG1VIDEO, - .priv_data_size = sizeof(Mpeg1Context), - .init = mpeg_decode_init, - .close = mpeg_decode_end, - .decode = mpeg_decode_frame, - .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, - .flush = flush, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), + .name = "mpeg1video", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MPEG1VIDEO, + .priv_data_size = sizeof(Mpeg1Context), + .init = mpeg_decode_init, + .close = mpeg_decode_end, + .decode = mpeg_decode_frame, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | + CODEC_CAP_SLICE_THREADS, + .flush = flush, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg_decode_update_thread_context) }; @@ -2513,7 +2515,9 @@ AVCodec ff_mpeg2video_decoder = { .init = mpeg_decode_init, .close = mpeg_decode_end, .decode = mpeg_decode_frame, - .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | + CODEC_CAP_SLICE_THREADS, .flush = flush, .max_lowres = 3, .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), @@ -2546,7 +2550,8 @@ AVCodec ff_mpeg_xvmc_decoder = { .init = mpeg_mc_decode_init, .close = mpeg_decode_end, .decode = mpeg_decode_frame, - .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video XvMC (X-Video Motion Compensation)"), }; @@ -2562,7 +2567,8 @@ AVCodec ff_mpeg_vdpau_decoder = { .init = mpeg_decode_init, .close = mpeg_decode_end, .decode = mpeg_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | + CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MPEG-1/2 video (VDPAU acceleration)"), }; @@ -2577,7 +2583,8 @@ AVCodec ff_mpeg1_vdpau_decoder = { .init = mpeg_decode_init, .close = mpeg_decode_end, .decode = mpeg_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | + CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_DELAY, .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video (VDPAU acceleration)"), }; diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index b6cbbbc2d2..b0175b1fc8 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -951,31 +951,34 @@ mpeg12_class(1) mpeg12_class(2) AVCodec ff_mpeg1video_encoder = { - .name = "mpeg1video", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MPEG1VIDEO, - .priv_data_size = sizeof(MpegEncContext), - .init = encode_init, - .encode2 = ff_MPV_encode_picture, - .close = ff_MPV_encode_end, - .supported_framerates= avpriv_frame_rate_tab+1, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .capabilities= CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), - .priv_class = &mpeg1_class, + .name = "mpeg1video", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MPEG1VIDEO, + .priv_data_size = sizeof(MpegEncContext), + .init = encode_init, + .encode2 = ff_MPV_encode_picture, + .close = ff_MPV_encode_end, + .supported_framerates = avpriv_frame_rate_tab+1, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, + PIX_FMT_NONE }, + .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), + .priv_class = &mpeg1_class, }; AVCodec ff_mpeg2video_encoder = { - .name = "mpeg2video", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MPEG2VIDEO, - .priv_data_size = sizeof(MpegEncContext), - .init = encode_init, - .encode2 = ff_MPV_encode_picture, - .close = ff_MPV_encode_end, - .supported_framerates= avpriv_frame_rate_tab+1, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE}, - .capabilities= CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"), - .priv_class = &mpeg2_class, + .name = "mpeg2video", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MPEG2VIDEO, + .priv_data_size = sizeof(MpegEncContext), + .init = encode_init, + .encode2 = ff_MPV_encode_picture, + .close = ff_MPV_encode_end, + .supported_framerates = avpriv_frame_rate_tab + 1, + .pix_fmts = (const enum PixelFormat[]){ + PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE + }, + .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), + .priv_class = &mpeg2_class, }; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 8c817bc8ae..f45d86fd35 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2255,20 +2255,22 @@ static const AVProfile mpeg4_video_profiles[] = { }; AVCodec ff_mpeg4_decoder = { - .name = "mpeg4", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_MPEG4, - .priv_data_size = sizeof(MpegEncContext), - .init = decode_init, - .close = ff_h263_decode_end, - .decode = ff_h263_decode_frame, - .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, - .flush= ff_mpeg_flush, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), - .pix_fmts= ff_hwaccel_pixfmt_list_420, - .profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles), - .update_thread_context= ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context) + .name = "mpeg4", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MPEG4, + .priv_data_size = sizeof(MpegEncContext), + .init = decode_init, + .close = ff_h263_decode_end, + .decode = ff_h263_decode_frame, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | + CODEC_CAP_FRAME_THREADS, + .flush = ff_mpeg_flush, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), + .pix_fmts = ff_hwaccel_pixfmt_list_420, + .profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles), + .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context), }; @@ -2281,8 +2283,10 @@ AVCodec ff_mpeg4_vdpau_decoder = { .init = decode_init, .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"), - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_VDPAU_MPEG4, PIX_FMT_NONE}, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | + CODEC_CAP_HWACCEL_VDPAU, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_VDPAU_MPEG4, + PIX_FMT_NONE }, }; #endif diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index e6b015a431..95bb3a5261 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1339,8 +1339,8 @@ AVCodec ff_mpeg4_encoder = { .init = encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .capabilities= CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .priv_class = &mpeg4enc_class, }; diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index 385a79a675..6e79a614c1 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -782,15 +782,18 @@ static const AVCodecDefault mp2_defaults[] = { }; AVCodec ff_mp2_encoder = { - .name = "mp2", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_MP2, - .priv_data_size = sizeof(MpegAudioContext), - .init = MPA_encode_init, - .encode2 = MPA_encode_frame, - .close = MPA_encode_close, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .supported_samplerates= (const int[]){44100, 48000, 32000, 22050, 24000, 16000, 0}, - .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), - .defaults = mp2_defaults, + .name = "mp2", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_MP2, + .priv_data_size = sizeof(MpegAudioContext), + .init = MPA_encode_init, + .encode2 = MPA_encode_frame, + .close = MPA_encode_close, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .supported_samplerates = (const int[]){ + 44100, 48000, 32000, 22050, 24000, 16000, 0 + }, + .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), + .defaults = mp2_defaults, }; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 19aa4b45fc..f88df92d8d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4162,9 +4162,9 @@ AVCodec ff_h263p_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .capabilities = CODEC_CAP_SLICE_THREADS, - .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"), + .capabilities = CODEC_CAP_SLICE_THREADS, + .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"), .priv_class = &h263p_class, }; @@ -4178,8 +4178,8 @@ AVCodec ff_msmpeg4v2_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .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"), + .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"), .priv_class = &msmpeg4v2_class, }; @@ -4193,8 +4193,8 @@ AVCodec ff_msmpeg4v3_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .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"), + .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"), .priv_class = &msmpeg4v3_class, }; @@ -4208,7 +4208,7 @@ AVCodec ff_wmv1_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), .priv_class = &wmv1_class, }; diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 6cf0748ece..a91eea52a5 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -1216,9 +1216,9 @@ AVCodec ff_msmpeg4v1_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), - .pix_fmts= ff_pixfmt_list_420, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), + .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_msmpeg4v2_decoder = { @@ -1230,9 +1230,9 @@ AVCodec ff_msmpeg4v2_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), - .pix_fmts= ff_pixfmt_list_420, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), + .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_msmpeg4v3_decoder = { @@ -1244,9 +1244,9 @@ AVCodec ff_msmpeg4v3_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), - .pix_fmts= ff_pixfmt_list_420, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), + .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_wmv1_decoder = { @@ -1258,7 +1258,7 @@ AVCodec ff_wmv1_decoder = { .close = ff_h263_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .max_lowres= 3, - .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), - .pix_fmts= ff_pixfmt_list_420, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 7"), + .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 41f1fd8ebd..0c8d3d79f8 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -153,5 +153,5 @@ AVCodec ff_msrle_decoder = { .close = msrle_decode_end, .decode = msrle_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name= NULL_IF_CONFIG_SMALL("Microsoft RLE"), + .long_name = NULL_IF_CONFIG_SMALL("Microsoft RLE"), }; diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index a5fef4ddf7..eabdbedf0a 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -342,5 +342,5 @@ AVCodec ff_msvideo1_decoder = { .close = msvideo1_decode_end, .decode = msvideo1_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name= NULL_IF_CONFIG_SMALL("Microsoft Video 1"), + .long_name = NULL_IF_CONFIG_SMALL("Microsoft Video 1"), }; diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 6f0d0457f7..c00997007a 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -338,5 +338,5 @@ AVCodec ff_mxpeg_decoder = { .close = mxpeg_decode_end, .decode = mxpeg_decode_frame, .capabilities = CODEC_CAP_DR1, - .max_lowres = 3 + .max_lowres = 3, }; diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 1583c20c33..09a335fefc 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -222,7 +222,7 @@ AVCodec ff_nellymoser_decoder = { .close = decode_end, .decode = decode_tag, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_PARAM_CHANGE, - .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 2a12853e54..e1b1d793a4 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -416,14 +416,15 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } AVCodec ff_nellymoser_encoder = { - .name = "nellymoser", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_NELLYMOSER, + .name = "nellymoser", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_NELLYMOSER, .priv_data_size = sizeof(NellyMoserEncodeContext), - .init = encode_init, - .encode2 = encode_frame, - .close = encode_end, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, + .init = encode_init, + .encode2 = encode_frame, + .close = encode_end, + .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 84935b6ad4..534fd03567 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -281,5 +281,5 @@ AVCodec ff_nuv_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), + .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo/RTJPEG"), }; diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index 4802ca396d..bf8d82c443 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -121,6 +121,9 @@ AVCodec ff_pam_encoder = { .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, .encode2 = pam_encode_frame, - .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"), + .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"), }; diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index 7c856e999f..3604013e08 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -321,7 +321,8 @@ AVCodec ff_pcm_bluray_decoder = { .init = pcm_bluray_decode_init, .decode = pcm_bluray_decode_frame, .capabilities = CODEC_CAP_DR1, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, - AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), + .sample_fmts = (const enum AVSampleFormat[]){ + AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE + }, + .long_name = NULL_IF_CONFIG_SMALL("PCM signed 16|20|24-bit big-endian for Blu-ray media"), }; diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 7eb1daaa7a..44b071d24d 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -256,5 +256,5 @@ AVCodec ff_pcx_decoder = { .close = pcx_end, .decode = pcx_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), + .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), }; diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c index c8259cd8b2..865d7bdbd3 100644 --- a/libavcodec/pcxenc.c +++ b/libavcodec/pcxenc.c @@ -209,10 +209,12 @@ AVCodec ff_pcx_encoder = { .priv_data_size = sizeof(PCXContext), .init = pcx_encode_init, .encode2 = pcx_encode_frame, - .pix_fmts = (const 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_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, + PIX_FMT_GRAY8, PIX_FMT_PAL8, PIX_FMT_MONOBLACK, - PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), + PIX_FMT_NONE + }, + .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), }; diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 79ae113a7f..33354122b2 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -476,5 +476,5 @@ AVCodec ff_pgssub_decoder = { .init = init_decoder, .close = close_decoder, .decode = decode, - .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), + .long_name = NULL_IF_CONFIG_SMALL("HDMV Presentation Graphic Stream subtitles"), }; diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index e0bc899946..53a14c90e2 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -258,5 +258,5 @@ AVCodec ff_pictor_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"), + .long_name = NULL_IF_CONFIG_SMALL("Pictor/PC Paint"), }; diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 56bda7c300..087abaed89 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -656,5 +656,5 @@ AVCodec ff_png_decoder = { .close = png_dec_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, - .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), + .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), }; diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index d79c800867..947c7e147b 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -460,6 +460,9 @@ AVCodec ff_png_encoder = { .priv_data_size = sizeof(PNGEncContext), .init = png_enc_init, .encode2 = encode_frame, - .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 (Portable Network Graphics) image"), + .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 (Portable Network Graphics) image"), }; diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index 50e8bce168..8185a4fc16 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -197,7 +197,7 @@ AVCodec ff_pgm_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), + .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif @@ -211,7 +211,7 @@ AVCodec ff_pgmyuv_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif @@ -225,7 +225,7 @@ AVCodec ff_ppm_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), + .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif @@ -239,7 +239,7 @@ AVCodec ff_pbm_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif @@ -253,6 +253,6 @@ AVCodec ff_pam_decoder = { .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), + .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 843629e8b9..f41baab72e 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -126,8 +126,10 @@ AVCodec ff_pgm_encoder = { .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, .encode2 = 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"), + .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 @@ -139,8 +141,8 @@ AVCodec ff_pgmyuv_encoder = { .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, .encode2 = 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"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif @@ -152,8 +154,10 @@ AVCodec ff_ppm_encoder = { .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, .encode2 = 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"), + .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 @@ -165,7 +169,8 @@ AVCodec ff_pbm_encoder = { .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, .encode2 = pnm_encode_frame, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_MONOWHITE, + PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index fd4933c1d6..2782706e82 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -125,5 +125,5 @@ AVCodec ff_ptx_decoder = { .close = ptx_end, .decode = ptx_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"), + .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"), }; diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 6acb7d8362..39aa3dfe1a 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1997,13 +1997,13 @@ static int qdm2_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_qdm2_decoder = { - .name = "qdm2", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_QDM2, + .name = "qdm2", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_QDM2, .priv_data_size = sizeof(QDM2Context), - .init = qdm2_decode_init, - .close = qdm2_decode_close, - .decode = qdm2_decode_frame, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), + .init = qdm2_decode_init, + .close = qdm2_decode_close, + .decode = qdm2_decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), }; diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index baf5de3e95..9794eab0ef 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -171,5 +171,5 @@ AVCodec ff_qdraw_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), + .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), }; diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index f8cbef37f2..2f1b7434f2 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -316,5 +316,5 @@ AVCodec ff_qpeg_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), + .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), }; diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index df9c8443f2..03115fa431 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -504,5 +504,5 @@ AVCodec ff_qtrle_decoder = { .close = qtrle_decode_end, .decode = qtrle_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), }; diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 6936722df7..c3dae160e0 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -335,6 +335,8 @@ AVCodec ff_qtrle_encoder = { .init = qtrle_encode_init, .encode2 = qtrle_encode_frame, .close = qtrle_encode_end, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB555BE, PIX_FMT_ARGB, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), + .pix_fmts = (const enum PixelFormat[]){ + PIX_FMT_RGB24, PIX_FMT_RGB555BE, PIX_FMT_ARGB, PIX_FMT_NONE + }, + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), }; diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index 0f85f5892b..dae3956f16 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -105,7 +105,7 @@ AVCodec ff_r210_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"), }; #endif #if CONFIG_R10K_DECODER @@ -117,6 +117,6 @@ AVCodec ff_r10k_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), + .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"), }; #endif diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c index 0e5b04663f..a75fe73168 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -532,5 +532,5 @@ AVCodec ff_ralf_decoder = { .decode = decode_frame, .flush = decode_flush, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless") + .long_name = NULL_IF_CONFIG_SMALL("RealAudio Lossless"), }; diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 016acd95af..a9884e6fe9 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -215,5 +215,5 @@ AVCodec ff_rawvideo_decoder = { .init = raw_init_decoder, .close = raw_close_decoder, .decode = raw_decode, - .long_name = NULL_IF_CONFIG_SMALL("raw video"), + .long_name = NULL_IF_CONFIG_SMALL("raw video"), }; diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index f435333fef..cf12684c45 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -73,5 +73,5 @@ AVCodec ff_rawvideo_encoder = { .priv_data_size = sizeof(AVFrame), .init = raw_init_encoder, .encode2 = raw_encode, - .long_name = NULL_IF_CONFIG_SMALL("raw video"), + .long_name = NULL_IF_CONFIG_SMALL("raw video"), }; diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index ace3b0cca5..9b21bb6c68 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -227,5 +227,5 @@ AVCodec ff_rl2_decoder = { .close = rl2_decode_end, .decode = rl2_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RL2 video"), + .long_name = NULL_IF_CONFIG_SMALL("RL2 video"), }; diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index 609beffb4b..6b6c259046 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -211,6 +211,7 @@ AVCodec ff_roq_dpcm_encoder = { .encode2 = roq_dpcm_encode_frame, .close = roq_dpcm_encode_close, .capabilities = CODEC_CAP_DELAY, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"), + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"), }; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 4b6375ca8c..7a548e5ad2 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -221,5 +221,5 @@ AVCodec ff_roq_decoder = { .close = roq_decode_end, .decode = roq_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), + .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), }; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 0ae6190bb8..b196b89d85 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1080,7 +1080,8 @@ AVCodec ff_roq_encoder = { .init = roq_encode_init, .encode2 = roq_encode_frame, .close = roq_encode_end, - .supported_framerates = (const AVRational[]){{30,1}, {0,0}}, - .pix_fmts = (const 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/rpza.c b/libavcodec/rpza.c index 59c3a7b3a7..d034e66e24 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -288,5 +288,5 @@ AVCodec ff_rpza_decoder = { .close = rpza_decode_end, .decode = rpza_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), + .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), }; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 577522504c..c5047adb8e 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -727,9 +727,9 @@ AVCodec ff_rv10_decoder = { .close = rv10_decode_end, .decode = rv10_decode_frame, .capabilities = CODEC_CAP_DR1, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), - .pix_fmts= ff_pixfmt_list_420, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), + .pix_fmts = ff_pixfmt_list_420, }; AVCodec ff_rv20_decoder = { @@ -741,8 +741,8 @@ AVCodec ff_rv20_decoder = { .close = rv10_decode_end, .decode = rv10_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .flush= ff_mpeg_flush, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), - .pix_fmts= ff_pixfmt_list_420, + .flush = ff_mpeg_flush, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), + .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c index 1b4694c502..a6127f62fe 100644 --- a/libavcodec/rv10enc.c +++ b/libavcodec/rv10enc.c @@ -66,7 +66,7 @@ AVCodec ff_rv10_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), .priv_class = &rv10_class, }; diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 8b50baf52f..44cc59ff58 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -67,7 +67,7 @@ AVCodec ff_rv20_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), .priv_class = &rv20_class, }; diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 1bb223cd7b..8a4cdf8aba 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -268,17 +268,18 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) } AVCodec ff_rv30_decoder = { - .name = "rv30", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_RV30, - .priv_data_size = sizeof(RV34DecContext), - .init = rv30_decode_init, - .close = ff_rv34_decode_end, - .decode = ff_rv34_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, - .flush = ff_mpeg_flush, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), - .pix_fmts = ff_pixfmt_list_420, + .name = "rv30", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_RV30, + .priv_data_size = sizeof(RV34DecContext), + .init = rv30_decode_init, + .close = ff_rv34_decode_end, + .decode = ff_rv34_decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | + CODEC_CAP_FRAME_THREADS, + .flush = ff_mpeg_flush, + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), + .pix_fmts = ff_pixfmt_list_420, .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 142259ffc0..b65a2005f0 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -557,17 +557,18 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) } AVCodec ff_rv40_decoder = { - .name = "rv40", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_RV40, - .priv_data_size = sizeof(RV34DecContext), - .init = rv40_decode_init, - .close = ff_rv34_decode_end, - .decode = ff_rv34_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_FRAME_THREADS, - .flush = ff_mpeg_flush, - .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), - .pix_fmts = ff_pixfmt_list_420, + .name = "rv40", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_RV40, + .priv_data_size = sizeof(RV34DecContext), + .init = rv40_decode_init, + .close = ff_rv34_decode_end, + .decode = ff_rv34_decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | + CODEC_CAP_FRAME_THREADS, + .flush = ff_mpeg_flush, + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), + .pix_fmts = ff_pixfmt_list_420, .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/sgidec.c b/libavcodec/sgidec.c index 580cf81a20..87d426e7c0 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -266,5 +266,5 @@ AVCodec ff_sgi_decoder = { .init = sgi_init, .close = sgi_end, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("SGI image"), + .long_name = NULL_IF_CONFIG_SMALL("SGI image"), }; diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index fac7facd0c..07c942e74c 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -177,6 +177,8 @@ AVCodec ff_sgi_encoder = { .priv_data_size = sizeof(SgiContext), .init = encode_init, .encode2 = encode_frame, - .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"), + .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/shorten.c b/libavcodec/shorten.c index 83777fb934..62b6ae1fe0 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -636,5 +636,5 @@ AVCodec ff_shorten_decoder = { .close = shorten_decode_close, .decode = shorten_decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name= NULL_IF_CONFIG_SMALL("Shorten"), + .long_name = NULL_IF_CONFIG_SMALL("Shorten"), }; diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index 4502fa5f2a..bd98e025b2 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -566,5 +566,5 @@ AVCodec ff_sipr_decoder = { .init = sipr_decoder_init, .decode = sipr_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"), + .long_name = NULL_IF_CONFIG_SMALL("RealAudio SIPR / ACELP.NET"), }; diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 46027306a8..43c206f25d 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -734,7 +734,7 @@ AVCodec ff_smacker_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Smacker video"), + .long_name = NULL_IF_CONFIG_SMALL("Smacker video"), }; AVCodec ff_smackaud_decoder = { @@ -745,5 +745,5 @@ AVCodec ff_smackaud_decoder = { .init = smka_decode_init, .decode = smka_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), + .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), }; diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 2bd3176f8e..37b00ca310 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -473,5 +473,5 @@ AVCodec ff_smc_decoder = { .close = smc_decode_end, .decode = smc_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), }; diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 488a953acf..ef5205d972 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -559,5 +559,5 @@ AVCodec ff_snow_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, - .long_name = NULL_IF_CONFIG_SMALL("Snow"), + .long_name = NULL_IF_CONFIG_SMALL("Snow"), }; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 6f0d43eb3b..03d0afcab0 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1922,7 +1922,7 @@ AVCodec ff_snow_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .long_name = NULL_IF_CONFIG_SMALL("Snow"), + .long_name = NULL_IF_CONFIG_SMALL("Snow"), .priv_class = &snowenc_class, }; #endif diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 4c42ab166c..256c2756ef 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -102,8 +102,8 @@ AVCodec ff_sp5x_decoder = { .close = ff_mjpeg_decode_end, .decode = sp5x_decode_frame, .capabilities = CODEC_CAP_DR1, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), }; AVCodec ff_amv_decoder = { @@ -114,5 +114,5 @@ AVCodec ff_amv_decoder = { .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, .decode = sp5x_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), + .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), }; diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index b41bb2e930..79e6d9dceb 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -202,5 +202,5 @@ AVCodec ff_sunrast_decoder = { .close = sunrast_end, .decode = sunrast_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), + .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), }; diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index a831459611..25972e4996 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -818,7 +818,7 @@ AVCodec ff_svq1_decoder = { .close = svq1_decode_end, .decode = svq1_decode_frame, .capabilities = CODEC_CAP_DR1, - .flush= ff_mpeg_flush, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), + .flush = ff_mpeg_flush, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV410P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), }; diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index c2c927c6c4..9519d240b5 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -586,6 +586,6 @@ AVCodec ff_svq1_encoder = { .init = svq1_encode_init, .encode2 = svq1_encode_frame, .close = svq1_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV410P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), }; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 99c1dec07c..f343d53447 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1109,7 +1109,8 @@ AVCodec ff_svq3_decoder = { .init = svq3_decode_init, .close = svq3_decode_end, .decode = svq3_decode_frame, - .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_NONE}, + .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | + CODEC_CAP_DELAY, + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUVJ420P, PIX_FMT_NONE }, }; diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 60c8e8d0a8..b703aa1336 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -264,5 +264,5 @@ AVCodec ff_targa_decoder = { .close = targa_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), + .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 6ac219ee30..0ee7fedb9d 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -162,12 +162,15 @@ static av_cold int targa_encode_init(AVCodecContext *avctx) } AVCodec ff_targa_encoder = { - .name = "targa", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_TARGA, + .name = "targa", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_TARGA, .priv_data_size = sizeof(TargaContext), - .init = targa_encode_init, - .encode2 = targa_encode_frame, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_BGRA, PIX_FMT_RGB555LE, PIX_FMT_GRAY8, PIX_FMT_NONE}, + .init = targa_encode_init, + .encode2 = targa_encode_frame, + .pix_fmts = (const enum PixelFormat[]){ + PIX_FMT_BGR24, PIX_FMT_BGRA, PIX_FMT_RGB555LE, PIX_FMT_GRAY8, + PIX_FMT_NONE + }, .long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index 12d5bce4ac..866d7a8a42 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -265,5 +265,5 @@ AVCodec ff_tiertexseqvideo_decoder = { .close = seqvideo_decode_end, .decode = seqvideo_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"), + .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ video"), }; diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index adbd15cbeb..cafd98b0fa 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -647,5 +647,5 @@ AVCodec ff_tiff_decoder = { .close = tiff_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), + .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), }; diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 776a1489cf..f50ee2530c 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -472,13 +472,13 @@ AVCodec ff_tiff_encoder = { .id = CODEC_ID_TIFF, .priv_data_size = sizeof(TiffEncoderContext), .encode2 = encode_frame, - .pix_fmts = - (const enum PixelFormat[]) {PIX_FMT_RGB24, PIX_FMT_PAL8, PIX_FMT_GRAY8, + .pix_fmts = (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, PIX_FMT_YUV411P, - PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), + PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), .priv_class = &tiffenc_class, }; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index a3bd3730fb..9e1168af43 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -899,5 +899,5 @@ AVCodec ff_truemotion1_decoder = { .close = truemotion1_decode_end, .decode = truemotion1_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 1.0"), }; diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 67976c8337..9937819593 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -960,5 +960,5 @@ AVCodec ff_truemotion2_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"), + .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"), }; diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index df35205ed9..bf83f53145 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -365,5 +365,5 @@ AVCodec ff_truespeech_decoder = { .init = truespeech_decode_init, .decode = truespeech_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), + .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), }; diff --git a/libavcodec/tta.c b/libavcodec/tta.c index ad80246525..acaeaaa948 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -473,5 +473,5 @@ AVCodec ff_tta_decoder = { .close = tta_decode_close, .decode = tta_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("True Audio (TTA)"), + .long_name = NULL_IF_CONFIG_SMALL("True Audio (TTA)"), }; diff --git a/libavcodec/txd.c b/libavcodec/txd.c index c05cc8e248..bfb2bb6ea2 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -162,5 +162,5 @@ AVCodec ff_txd_decoder = { .close = txd_end, .decode = txd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), + .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), }; diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index b671d91fd3..8168aa9739 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -426,5 +426,5 @@ AVCodec ff_ulti_decoder = { .close = ulti_decode_end, .decode = ulti_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), + .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), }; diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index d464572f78..5f74828d4e 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -130,5 +130,5 @@ AVCodec ff_v210_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index c7a01e19a5..c69dd9ba2c 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -123,6 +123,6 @@ AVCodec ff_v210_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_close, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV422P10, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c index 959dec5f86..24cd625592 100644 --- a/libavcodec/v210x.c +++ b/libavcodec/v210x.c @@ -140,5 +140,5 @@ AVCodec ff_v210x_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), }; diff --git a/libavcodec/vb.c b/libavcodec/vb.c index e7002a1def..f925cc63f7 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -274,5 +274,5 @@ AVCodec ff_vb_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), + .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), }; diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 409153f168..0f56e22fe4 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5704,7 +5704,7 @@ AVCodec ff_wmv3_vdpau_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9 VDPAU"), - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_VDPAU_WMV3, PIX_FMT_NONE }, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; #endif @@ -5720,7 +5720,7 @@ AVCodec ff_vc1_vdpau_decoder = { .decode = vc1_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1 VDPAU"), - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_VC1, PIX_FMT_NONE}, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_VDPAU_VC1, PIX_FMT_NONE }, .profiles = NULL_IF_CONFIG_SMALL(profiles) }; #endif diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index c0a0a1cdb6..23b06479ae 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -181,7 +181,7 @@ AVCodec ff_vcr1_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), + .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; #if CONFIG_VCR1_ENCODER @@ -192,6 +192,6 @@ AVCodec ff_vcr1_encoder = { .priv_data_size = sizeof(VCR1Context), .init = encode_init, .encode = encode_frame, - .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), + .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; #endif diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index 89b5c2bc6a..47a16d8655 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -658,7 +658,7 @@ AVCodec ff_vmdvideo_decoder = { .close = vmdvideo_decode_end, .decode = vmdvideo_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), }; AVCodec ff_vmdaudio_decoder = { @@ -669,5 +669,5 @@ AVCodec ff_vmdaudio_decoder = { .init = vmdaudio_decode_init, .decode = vmdaudio_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), }; diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index b1c4cbd1b7..7d7004da43 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -518,5 +518,5 @@ AVCodec ff_vmnc_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), + .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), }; diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 4a7d6097b1..36db356f27 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1714,18 +1714,18 @@ static av_cold void vorbis_decode_flush(AVCodecContext *avccontext) } AVCodec ff_vorbis_decoder = { - .name = "vorbis", - .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_VORBIS, - .priv_data_size = sizeof(vorbis_context), - .init = vorbis_decode_init, - .close = vorbis_decode_close, - .decode = vorbis_decode_frame, - .flush = vorbis_decode_flush, - .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), + .name = "vorbis", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_VORBIS, + .priv_data_size = sizeof(vorbis_context), + .init = vorbis_decode_init, + .close = vorbis_decode_close, + .decode = vorbis_decode_frame, + .flush = vorbis_decode_flush, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), .channel_layouts = ff_vorbis_channel_layouts, - .sample_fmts = (const enum AVSampleFormat[]) { + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, }; diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 3f3720979e..0b0caccb7c 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1213,7 +1213,8 @@ AVCodec ff_vorbis_encoder = { .init = vorbis_encode_init, .encode2 = vorbis_encode_frame, .close = vorbis_encode_close, - .capabilities= CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), + .capabilities = CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), }; diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 42bc63e501..ade8354b2a 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2374,32 +2374,34 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) } AVCodec ff_theora_decoder = { - .name = "theora", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_THEORA, - .priv_data_size = sizeof(Vp3DecodeContext), - .init = theora_decode_init, - .close = vp3_decode_end, - .decode = vp3_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, - .flush = vp3_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("Theora"), + .name = "theora", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_THEORA, + .priv_data_size = sizeof(Vp3DecodeContext), + .init = theora_decode_init, + .close = vp3_decode_end, + .decode = vp3_decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | + CODEC_CAP_FRAME_THREADS, + .flush = vp3_decode_flush, + .long_name = NULL_IF_CONFIG_SMALL("Theora"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context) }; #endif AVCodec ff_vp3_decoder = { - .name = "vp3", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_VP3, - .priv_data_size = sizeof(Vp3DecodeContext), - .init = vp3_decode_init, - .close = vp3_decode_end, - .decode = vp3_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_FRAME_THREADS, - .flush = vp3_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), + .name = "vp3", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_VP3, + .priv_data_size = sizeof(Vp3DecodeContext), + .init = vp3_decode_init, + .close = vp3_decode_end, + .decode = vp3_decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND | + CODEC_CAP_FRAME_THREADS, + .flush = vp3_decode_flush, + .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp3_init_thread_copy), - .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context) + .update_thread_context = ONLY_IF_THREADS_ENABLED(vp3_update_thread_context), }; diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 19079ffd0d..189b20ab85 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -287,5 +287,5 @@ AVCodec ff_vp5_decoder = { .close = ff_vp56_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), + .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), }; diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index f2c41aa104..741208ce20 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -633,7 +633,7 @@ AVCodec ff_vp6_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), }; /* flash version, not flipped upside-down */ @@ -646,7 +646,7 @@ AVCodec ff_vp6f_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), }; /* flash version, not flipped upside-down, with alpha channel */ @@ -659,5 +659,5 @@ AVCodec ff_vp6a_decoder = { .close = vp6_decode_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), }; diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 6da835b2d1..1c973d5bed 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1850,16 +1850,16 @@ static int vp8_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo } AVCodec ff_vp8_decoder = { - .name = "vp8", - .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_VP8, - .priv_data_size = sizeof(VP8Context), - .init = vp8_decode_init, - .close = vp8_decode_free, - .decode = vp8_decode_frame, - .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .flush = vp8_decode_flush, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), + .name = "vp8", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_VP8, + .priv_data_size = sizeof(VP8Context), + .init = vp8_decode_init, + .close = vp8_decode_free, + .decode = vp8_decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .flush = vp8_decode_flush, + .long_name = NULL_IF_CONFIG_SMALL("On2 VP8"), .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp8_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp8_decode_update_thread_context), }; diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 54699a0ade..9cca3e743d 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -627,5 +627,5 @@ AVCodec ff_vqa_decoder = { .close = vqa_decode_end, .decode = vqa_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), }; diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 570ff4108d..35dac73149 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -427,7 +427,8 @@ AVCodec ff_wmav1_encoder = { .init = encode_init, .encode2 = encode_superframe, .close = ff_wma_end, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), }; @@ -439,6 +440,7 @@ AVCodec ff_wmav2_encoder = { .init = encode_init, .encode2 = encode_superframe, .close = ff_wma_end, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), }; diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 6bc9fad983..30a43c8585 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1624,6 +1624,6 @@ AVCodec ff_wmapro_decoder = { .close = decode_end, .decode = decode_packet, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, - .flush= flush, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), + .flush = flush, + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), }; diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index ebc6a59ae9..ef711141da 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -2052,6 +2052,6 @@ AVCodec ff_wmavoice_decoder = { .close = wmavoice_decode_end, .decode = wmavoice_decode_packet, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, - .flush = wmavoice_flush, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"), + .flush = wmavoice_flush, + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Voice"), }; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 21fc1cf82e..4847efac31 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -479,7 +479,7 @@ AVCodec ff_wmv2_decoder = { .close = wmv2_decode_end, .decode = ff_h263_decode_frame, .capabilities = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .max_lowres = 3, - .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), - .pix_fmts= ff_pixfmt_list_420, + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), + .pix_fmts = ff_pixfmt_list_420, }; diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 4948a29f79..b7a8446ddd 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -219,6 +219,6 @@ AVCodec ff_wmv2_encoder = { .init = wmv2_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 8"), + .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/wnv1.c b/libavcodec/wnv1.c index e4b222cf87..b57c215e8e 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -165,5 +165,5 @@ AVCodec ff_wnv1_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), + .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), }; diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index e8e4d1567c..53e7b38c01 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -190,5 +190,5 @@ AVCodec ff_ws_snd1_decoder = { .init = ws_snd_decode_init, .decode = ws_snd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), + .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), }; diff --git a/libavcodec/xl.c b/libavcodec/xl.c index 19cb44fb6b..e74d131943 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -153,5 +153,5 @@ AVCodec ff_xl_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), + .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), }; diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index 4561714124..3526725f65 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -421,5 +421,5 @@ AVCodec ff_xan_wc4_decoder = { .close = xan_decode_end, .decode = xan_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"), + .long_name = NULL_IF_CONFIG_SMALL("Wing Commander IV / Xxan"), }; diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 3c2d8b8957..a16a5eb6f7 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -255,5 +255,5 @@ AVCodec ff_yop_decoder = { .init = yop_decode_init, .close = yop_decode_close, .decode = yop_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), + .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), }; diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 49e15ff7f9..bec7abde8d 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -681,5 +681,5 @@ AVCodec ff_zmbv_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), }; diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index 5d2728e0e7..8b9bd86450 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -344,6 +344,6 @@ AVCodec ff_zmbv_encoder = { .init = encode_init, .encode2 = encode_frame, .close = encode_end, - .pix_fmts = (const enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_PAL8, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), }; |