diff options
167 files changed, 235 insertions, 231 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 9eea643..0fc7a2e 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -836,6 +836,6 @@ AVCodec fourxm_decoder = { decode_end, decode_frame, /*CODEC_CAP_DR1,*/ - .long_name = "4X Movie", + .long_name = NULL_IF_CONFIG_SMALL("4X Movie"), }; diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 3b248c9..447d460 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -230,5 +230,5 @@ AVCodec eightbps_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "QuickTime 8BPS video", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"), }; diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index cdbd6b7..660f00c 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -96,7 +96,7 @@ AVCodec eightsvx_fib_decoder = { .priv_data_size = sizeof (EightSvxContext), .init = eightsvx_decode_init, .decode = eightsvx_decode_frame, - .long_name = "8SVX fibonacci", + .long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"), }; AVCodec eightsvx_exp_decoder = { @@ -106,5 +106,5 @@ AVCodec eightsvx_exp_decoder = { .priv_data_size = sizeof (EightSvxContext), .init = eightsvx_decode_init, .decode = eightsvx_decode_frame, - .long_name = "8SVX exponential", + .long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"), }; diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 1e599e0..0117201 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -171,5 +171,5 @@ AVCodec aasc_decoder = { aasc_decode_end, aasc_decode_frame, CODEC_CAP_DR1, - .long_name = "Autodesk RLE", + .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"), }; diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 9bdfacd..bd1310b 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1198,5 +1198,5 @@ AVCodec ac3_decoder = { .init = ac3_decode_init, .close = ac3_decode_end, .decode = ac3_decode_frame, - .long_name = "ATSC A/52 / AC-3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 / AC-3"), }; diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index b171055..b4410b3 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1364,5 +1364,5 @@ AVCodec ac3_encoder = { AC3_encode_frame, AC3_encode_close, NULL, - .long_name = "ATSC A/52 / AC-3", + .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 / AC-3"), }; diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f66274e..99ea285 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1610,7 +1610,7 @@ AVCodec name ## _encoder = { \ adpcm_encode_frame, \ adpcm_encode_close, \ NULL, \ - .long_name = long_name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; #else #define ADPCM_ENCODER(id,name,long_name_) @@ -1627,7 +1627,7 @@ AVCodec name ## _decoder = { \ NULL, \ NULL, \ adpcm_decode_frame, \ - .long_name = long_name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; #else #define ADPCM_DECODER(id,name,long_name_) diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 13ff33d..91331c0 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -165,6 +165,6 @@ AVCodec adpcm_adx_decoder = { NULL, NULL, adx_decode_frame, - .long_name = "SEGA CRI ADX", + .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"), }; diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c index e5d405a..927ecd7 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -190,5 +190,5 @@ AVCodec adpcm_adx_encoder = { adx_encode_frame, adx_encode_close, NULL, - .long_name = "SEGA CRI ADX", + .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"), }; diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 85fb246..e704565 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -620,5 +620,5 @@ AVCodec alac_decoder = { NULL, alac_decode_close, alac_decode_frame, - .long_name = "ALAC (Apple Lossless Audio Codec)", + .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), }; diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 60c12b1..4cc90f2 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -917,5 +917,5 @@ AVCodec ape_decoder = { NULL, ape_decode_close, ape_decode_frame, - .long_name = "Monkey's Audio", + .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"), }; diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index bed7e75..7bf93fb 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -615,7 +615,7 @@ AVCodec asv1_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name= "ASUS V1", + .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"), }; AVCodec asv2_decoder = { @@ -628,7 +628,7 @@ AVCodec asv2_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name= "ASUS V2", + .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), }; #ifdef CONFIG_ENCODERS @@ -642,7 +642,7 @@ AVCodec asv1_encoder = { encode_frame, //encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "ASUS V1", + .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"), }; AVCodec asv2_encoder = { @@ -654,7 +654,7 @@ AVCodec asv2_encoder = { encode_frame, //encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "ASUS V2", + .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), }; #endif //CONFIG_ENCODERS diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 957d56b..7bf3ec2 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -1071,5 +1071,5 @@ AVCodec atrac3_decoder = .init = atrac3_decode_init, .close = atrac3_decode_close, .decode = atrac3_decode_frame, - .long_name = "Atrac 3 (Adaptive TRansform Acoustic Coding 3)", + .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), }; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d7dbe15..19b7e56 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2245,7 +2245,11 @@ typedef struct AVCodec { void (*flush)(AVCodecContext *); const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0} const enum PixelFormat *pix_fmts; ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1 - const char *long_name; ///< descriptive name for the codec, meant to be more human readable than \p name + /** + * Descriptive name for the codec, meant to be more human readable than \p name. + * You \e should use the NULL_IF_CONFIG_SMALL() macro to define it. + */ + const char *long_name; const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 } AVCodec; diff --git a/libavcodec/avs.c b/libavcodec/avs.c index 79bfeb1..c60fe63 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -158,5 +158,5 @@ AVCodec avs_decoder = { NULL, avs_decode_frame, CODEC_CAP_DR1, - .long_name = "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 08808c4..69d08b4 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -136,5 +136,5 @@ AVCodec bethsoftvid_decoder = { .init = bethsoftvid_decode_init, .close = bethsoftvid_decode_end, .decode = bethsoftvid_decode_frame, - .long_name = "Bethesda VID video", + .long_name = NULL_IF_CONFIG_SMALL("Bethesda VID video"), }; diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index c3f2300..eaea808 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -178,5 +178,5 @@ AVCodec bfi_decoder = { .init = bfi_decode_init, .close = bfi_decode_close, .decode = bfi_decode_frame, - .long_name = "Brute Force & Ignorance", + .long_name = NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), }; diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index f97b5e5..16a5e92 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -258,5 +258,5 @@ AVCodec bmp_decoder = { NULL, bmp_decode_end, bmp_decode_frame, - .long_name = "BMP image", + .long_name = NULL_IF_CONFIG_SMALL("BMP image"), }; diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 0cee7c6..a54355c 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -95,5 +95,5 @@ AVCodec bmp_encoder = { bmp_encode_frame, NULL, //encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, - .long_name = "BMP image", + .long_name = NULL_IF_CONFIG_SMALL("BMP image"), }; diff --git a/libavcodec/c93.c b/libavcodec/c93.c index ae144f0..18ed7af 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -250,5 +250,5 @@ AVCodec c93_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "Interplay C93", + .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"), }; diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index b212eb9..a978fe1 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -699,5 +699,5 @@ AVCodec cavs_decoder = { cavs_decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush= cavs_flush, - .long_name= "Chinese AVS video (AVS1-P2, JiZhun profile)", + .long_name= NULL_IF_CONFIG_SMALL("Chinese AVS video (AVS1-P2, JiZhun profile)"), }; diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index ad3823f..b83edd1 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -463,5 +463,5 @@ AVCodec cinepak_decoder = { cinepak_decode_end, cinepak_decode_frame, CODEC_CAP_DR1, - .long_name = "Cinepak", + .long_name = NULL_IF_CONFIG_SMALL("Cinepak"), }; diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index b0de30c..ddc0058 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -140,7 +140,7 @@ AVCodec cljr_decoder = { NULL, decode_frame, CODEC_CAP_DR1, - .long_name = "Cirrus Logic AccuPak", + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #if 0 #ifdef CONFIG_ENCODERS @@ -153,7 +153,7 @@ AVCodec cljr_encoder = { encode_init, encode_frame, //encode_end, - .long_name = "Cirrus Logic AccuPak", + .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #endif //CONFIG_ENCODERS diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 3b7a4fd..fa945ec 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -1195,5 +1195,5 @@ AVCodec cook_decoder = .init = cook_decode_init, .close = cook_decode_close, .decode = cook_decode_frame, - .long_name = "COOK", + .long_name = NULL_IF_CONFIG_SMALL("COOK"), }; diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 39f4bd4..2999d44 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -258,6 +258,6 @@ AVCodec cscd_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "CamStudio", + .long_name = NULL_IF_CONFIG_SMALL("CamStudio"), }; diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 26bf755..d64f6df 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -181,6 +181,6 @@ AVCodec cyuv_decoder = { cyuv_decode_frame, CODEC_CAP_DR1, NULL, - .long_name = "Creative YUV (CYUV)", + .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"), }; diff --git a/libavcodec/dca.c b/libavcodec/dca.c index acbdb91..8770def 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -1264,5 +1264,5 @@ AVCodec dca_decoder = { .priv_data_size = sizeof(DCAContext), .init = dca_decode_init, .decode = dca_decode_frame, - .long_name = "DCA (DTS Coherent Acoustics)", + .long_name = NULL_IF_CONFIG_SMALL("DCA (DTS Coherent Acoustics)"), }; diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 593ee95..1f4f1c8 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -342,5 +342,5 @@ AVCodec dnxhd_decoder = { dnxhd_decode_close, dnxhd_decode_frame, CODEC_CAP_DR1, - .long_name = "VC3/DNxHD", + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), }; diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 84a56e7..6b1a214 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -857,5 +857,5 @@ AVCodec dnxhd_encoder = { dnxhd_encode_picture, dnxhd_encode_end, .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_NONE}, - .long_name = "VC3/DNxHD", + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), }; diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index b8fecf7..468a743 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -304,7 +304,7 @@ AVCodec name ## _decoder = { \ NULL, \ NULL, \ dpcm_decode_frame, \ - .long_name = long_name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; DPCM_DECODER(CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "Interplay DPCM"); diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c index 3ff6d04..2cd5db8 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -348,7 +348,7 @@ AVCodec dsicinvideo_decoder = { cinvideo_decode_end, cinvideo_decode_frame, CODEC_CAP_DR1, - .long_name = "Delphine Software International CIN video", + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"), }; AVCodec dsicinaudio_decoder = { @@ -360,5 +360,5 @@ AVCodec dsicinaudio_decoder = { NULL, NULL, cinaudio_decode_frame, - .long_name = "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 692ab59..0f28729 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -1236,7 +1236,7 @@ AVCodec dvvideo_encoder = { dvvideo_init, dvvideo_encode_frame, .pix_fmts = (enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name = "DV (Digital Video)", + .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), }; #endif // CONFIG_DVVIDEO_ENCODER @@ -1252,6 +1252,6 @@ AVCodec dvvideo_decoder = { dvvideo_decode_frame, CODEC_CAP_DR1, NULL, - .long_name = "DV (Digital Video)", + .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), }; #endif diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index f7a719a..d7cb2c4 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -408,5 +408,5 @@ AVCodec dvbsub_encoder = { sizeof(DVBSubtitleContext), NULL, dvbsub_encode, - .long_name = "DVB subtitles", + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), }; diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 47fea45..3f47c1b 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1430,5 +1430,5 @@ AVCodec dvbsub_decoder = { NULL, dvbsub_close_decoder, dvbsub_decode, - .long_name = "DVB subtitles", + .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), }; diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 1421c6b..29f9adf 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -506,5 +506,5 @@ AVCodec dvdsub_decoder = { NULL, NULL, dvdsub_decode, - .long_name = "DVD subtitles", + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), }; diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index 0859ee2..a5380ce 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -222,5 +222,5 @@ AVCodec dvdsub_encoder = { 0, NULL, dvdsub_encode, - .long_name = "DVD subtitles", + .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"), }; diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 2df987a..3d03445 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -327,6 +327,6 @@ AVCodec dxa_decoder = { NULL, decode_end, decode_frame, - .long_name = "Feeble Files/ScummVM DXA", + .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"), }; diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index 378e414..90ba479 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -380,6 +380,6 @@ AVCodec escape124_decoder = { escape124_decode_close, escape124_decode_frame, CODEC_CAP_DR1, - .long_name = "Escape 124", + .long_name = NULL_IF_CONFIG_SMALL("Escape 124"), }; diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 0dc7c07..133347e 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1026,7 +1026,7 @@ AVCodec ffv1_decoder = { decode_frame, CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, NULL, - .long_name= "FFmpeg codec #1", + .long_name= NULL_IF_CONFIG_SMALL("FFmpeg codec #1"), }; #ifdef CONFIG_ENCODERS @@ -1039,6 +1039,6 @@ AVCodec ffv1_encoder = { encode_frame, common_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_NONE}, - .long_name= "FFmpeg codec #1", + .long_name= NULL_IF_CONFIG_SMALL("FFmpeg codec #1"), }; #endif diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 0a59037..5896deb 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -774,5 +774,5 @@ AVCodec flac_decoder = { flac_decode_close, flac_decode_frame, .flush= flac_flush, - .long_name= "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 9b798d1..34fdd03 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1492,5 +1492,5 @@ AVCodec flac_encoder = { flac_encode_close, NULL, .capabilities = CODEC_CAP_SMALL_LAST_FRAME, - .long_name = "FLAC (Free Lossless Audio Codec)", + .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"), }; diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index fc87b6a..3842594 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -255,5 +255,5 @@ AVCodec flashsv_decoder = { flashsv_decode_frame, CODEC_CAP_DR1, .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, - .long_name = "Flash Screen Video v1", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video v1"), }; diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 2a95ffb..645a4eb 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -293,6 +293,6 @@ AVCodec flashsv_encoder = { flashsv_encode_frame, flashsv_encode_end, .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE}, - .long_name = "Flash Screen Video", + .long_name = NULL_IF_CONFIG_SMALL("Flash Screen Video"), }; diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 46aa3fc..4a8cb5e 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -750,5 +750,5 @@ AVCodec flic_decoder = { NULL, NULL, NULL, - .long_name = "Autodesk Animator Flic video", + .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"), }; diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 04cfd0b..a5f46de 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -365,5 +365,5 @@ AVCodec fraps_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "Fraps", + .long_name = NULL_IF_CONFIG_SMALL("Fraps"), }; diff --git a/libavcodec/g726.c b/libavcodec/g726.c index d9eb94a..1a0d40d 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -413,7 +413,7 @@ AVCodec adpcm_g726_encoder = { g726_encode_frame, g726_close, NULL, - .long_name = "G.726 ADPCM", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), }; #endif //CONFIG_ENCODERS @@ -426,5 +426,5 @@ AVCodec adpcm_g726_decoder = { NULL, g726_close, g726_decode_frame, - .long_name = "G.726 ADPCM", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), }; diff --git a/libavcodec/gif.c b/libavcodec/gif.c index 7dd248e..35cd0a0 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -341,5 +341,5 @@ AVCodec gif_encoder = { gif_encode_frame, NULL, //encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE}, - .long_name= "GIF (Graphics Interchange Format)", + .long_name= NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), }; diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 7186886..ee805a8 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -333,5 +333,5 @@ AVCodec gif_decoder = { NULL, gif_decode_close, gif_decode_frame, - .long_name = "GIF (Graphics Interchange Format)", + .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), }; diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 45c3972..07be335 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -647,5 +647,5 @@ AVCodec h261_decoder = { h261_decode_end, h261_decode_frame, CODEC_CAP_DR1, - .long_name = "H.261", + .long_name = NULL_IF_CONFIG_SMALL("H.261"), }; diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 783d5dc..74f6ab7 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -330,6 +330,6 @@ AVCodec h261_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "H.261", + .long_name= NULL_IF_CONFIG_SMALL("H.261"), }; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 9549846..5ff7784 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -723,7 +723,7 @@ AVCodec mpeg4_decoder = { ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, - .long_name= "MPEG-4 part 2", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), }; AVCodec h263_decoder = { @@ -737,7 +737,7 @@ AVCodec h263_decoder = { ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, - .long_name="H.263", + .long_name= NULL_IF_CONFIG_SMALL("H.263"), }; AVCodec msmpeg4v1_decoder = { @@ -750,7 +750,7 @@ AVCodec msmpeg4v1_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name="MPEG-4 part 2 Microsoft variant version 1", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), }; AVCodec msmpeg4v2_decoder = { @@ -763,7 +763,7 @@ AVCodec msmpeg4v2_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name="MPEG-4 part 2 Microsoft variant version 2", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), }; AVCodec msmpeg4v3_decoder = { @@ -776,7 +776,7 @@ AVCodec msmpeg4v3_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name="MPEG-4 part 2 Microsoft variant version 3", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), }; AVCodec wmv1_decoder = { @@ -789,7 +789,7 @@ AVCodec wmv1_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name= "Windows Media Video 7", + .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), }; AVCodec h263i_decoder = { @@ -802,7 +802,7 @@ AVCodec h263i_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = "H.263i", + .long_name = NULL_IF_CONFIG_SMALL("H.263i"), }; AVCodec flv_decoder = { @@ -815,5 +815,5 @@ AVCodec flv_decoder = { ff_h263_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name= "Flash Video", + .long_name= NULL_IF_CONFIG_SMALL("Flash Video"), }; diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b19dd78..c13d5b3 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -8100,7 +8100,7 @@ AVCodec h264_decoder = { decode_frame, /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= flush_dpb, - .long_name = "H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10", + .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), }; #include "svq3.c" diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 3c57087..83b1053 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -1445,7 +1445,7 @@ AVCodec huffyuv_decoder = { decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND, NULL, - .long_name = "Huffyuv / HuffYUV", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; AVCodec ffvhuff_decoder = { @@ -1459,7 +1459,7 @@ AVCodec ffvhuff_decoder = { decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND, NULL, - .long_name = "Huffyuv FFmpeg variant", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif @@ -1474,7 +1474,7 @@ AVCodec huffyuv_encoder = { encode_frame, encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, - .long_name = "Huffyuv / HuffYUV", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; AVCodec ffvhuff_encoder = { @@ -1486,7 +1486,7 @@ AVCodec ffvhuff_encoder = { encode_frame, encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE}, - .long_name = "Huffyuv FFmpeg variant", + .long_name = NULL_IF_CONFIG_SMALL("Huffyuv FFmpeg variant"), }; #endif //CONFIG_ENCODERS diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c index e10c173..43889a6 100644 --- a/libavcodec/idcinvideo.c +++ b/libavcodec/idcinvideo.c @@ -262,6 +262,6 @@ AVCodec idcin_decoder = { idcin_decode_end, idcin_decode_frame, CODEC_CAP_DR1, - .long_name = "id Quake II CIN video", + .long_name = NULL_IF_CONFIG_SMALL("id Quake II CIN video"), }; diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 12ce595..80372b8 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -813,5 +813,5 @@ AVCodec imc_decoder = { .init = imc_decode_init, .close = imc_decode_close, .decode = imc_decode_frame, - .long_name = "IMC (Intel Music Coder)", + .long_name = NULL_IF_CONFIG_SMALL("IMC (Intel Music Coder)"), }; diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 4ab4a99..236e4aa 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -219,5 +219,5 @@ AVCodec indeo2_decoder = { NULL, ir2_decode_frame, CODEC_CAP_DR1, - .long_name = "Intel Indeo 2", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), }; diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 7e6bdf6..2c310e0 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -1135,5 +1135,5 @@ AVCodec indeo3_decoder = { indeo3_decode_frame, 0, NULL, - .long_name = "Intel Indeo 3", + .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"), }; diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index a2cf2e4..16ac977 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -942,5 +942,5 @@ AVCodec interplay_video_decoder = { ipvideo_decode_end, ipvideo_decode_frame, CODEC_CAP_DR1, - .long_name = "Interplay MVE Video", + .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE Video"), }; diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index d72fc26..7842759 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -372,5 +372,5 @@ AVCodec jpegls_decoder = { ff_mjpeg_decode_end, ff_mjpeg_decode_frame, CODEC_CAP_DR1, - .long_name = "JPEG-LS", + .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), }; diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index c3c693a..f799550 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -390,5 +390,5 @@ AVCodec jpegls_encoder = { //FIXME avoid MPV_* lossless JPEG should not need the encode_picture_ls, NULL, .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, PIX_FMT_NONE}, - .long_name= "JPEG-LS", + .long_name= NULL_IF_CONFIG_SMALL("JPEG-LS"), }; diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index ae2c613..3ab4adf 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -411,5 +411,5 @@ AVCodec kmvc_decoder = { NULL, decode_end, decode_frame, - .long_name = "Karl Morton's video codec", + .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"), }; diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index e9add52..5560b9a 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -697,7 +697,7 @@ AVCodec mszh_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name ="LCL (LossLess Codec Library) MSZH", + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) MSZH"), }; #endif @@ -712,6 +712,6 @@ AVCodec zlib_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name ="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 343d55c..ee9b429 100644 --- a/libavcodec/lclenc.c +++ b/libavcodec/lclenc.c @@ -228,5 +228,5 @@ AVCodec zlib_encoder = { encode_init, encode_frame, encode_end, - .long_name = "LCL (LossLess Codec Library) ZLIB", + .long_name = NULL_IF_CONFIG_SMALL("LCL (LossLess Codec Library) ZLIB"), }; diff --git a/libavcodec/liba52.c b/libavcodec/liba52.c index 5f97e4d..becae1d 100644 --- a/libavcodec/liba52.c +++ b/libavcodec/liba52.c @@ -222,5 +222,5 @@ AVCodec liba52_decoder = { NULL, a52_decode_end, a52_decode_frame, - .long_name = "liba52 ATSC A/52 / AC-3", + .long_name = NULL_IF_CONFIG_SMALL("liba52 ATSC A/52 / AC-3"), }; diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c index 4a73ee0..0e23de1 100644 --- a/libavcodec/libamr.c +++ b/libavcodec/libamr.c @@ -503,7 +503,7 @@ AVCodec libamr_nb_decoder = NULL, amr_nb_decode_close, amr_nb_decode_frame, - .long_name = "libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band", + .long_name = NULL_IF_CONFIG_SMALL("libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band"), }; AVCodec libamr_nb_encoder = @@ -516,7 +516,7 @@ AVCodec libamr_nb_encoder = amr_nb_encode_frame, amr_nb_encode_close, NULL, - .long_name = "libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band", + .long_name = NULL_IF_CONFIG_SMALL("libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band"), }; #endif @@ -697,7 +697,7 @@ AVCodec libamr_wb_decoder = NULL, amr_wb_decode_close, amr_wb_decode_frame, - .long_name = "libamr-wb Adaptive Multi-Rate (AMR) Wide-Band", + .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"), }; AVCodec libamr_wb_encoder = @@ -710,7 +710,7 @@ AVCodec libamr_wb_encoder = amr_wb_encode_frame, amr_wb_encode_close, NULL, - .long_name = "libamr-wb Adaptive Multi-Rate (AMR) Wide-Band", + .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"), }; #endif //CONFIG_LIBAMR_WB diff --git a/libavcodec/libdiracdec.c b/libavcodec/libdiracdec.c index 6ef4ef1..06830f7 100644 --- a/libavcodec/libdiracdec.c +++ b/libavcodec/libdiracdec.c @@ -205,5 +205,5 @@ AVCodec libdirac_decoder = { libdirac_decode_frame, CODEC_CAP_DELAY, .flush = libdirac_flush, - .long_name = "libdirac Dirac 2.2", + .long_name = NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"), } ; diff --git a/libavcodec/libdiracenc.c b/libavcodec/libdiracenc.c index e8d0314..c5a580b 100644 --- a/libavcodec/libdiracenc.c +++ b/libavcodec/libdiracenc.c @@ -370,5 +370,5 @@ AVCodec libdirac_encoder = { libdirac_encode_close, .capabilities= CODEC_CAP_DELAY, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, -1}, - .long_name= "libdirac Dirac 2.2", + .long_name= NULL_IF_CONFIG_SMALL("libdirac Dirac 2.2"), } ; diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c index be262a9..a66ac2e 100644 --- a/libavcodec/libfaac.c +++ b/libavcodec/libfaac.c @@ -151,5 +151,5 @@ AVCodec libfaac_encoder = { Faac_encode_init, Faac_encode_frame, Faac_encode_close, - .long_name = "libfaac AAC (Advanced Audio Codec)", + .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"), }; diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c index 32f06ac..dc66788 100644 --- a/libavcodec/libfaad.c +++ b/libavcodec/libfaad.c @@ -325,7 +325,7 @@ AVCodec name ## _decoder = { \ NULL, \ faac_decode_end, \ faac_decode_frame, \ - .long_name = long_name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ } // FIXME - raw AAC files - maybe just one entry will be enough diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index 91b956f..ef2f5e7 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -117,7 +117,7 @@ AVCodec libgsm_encoder = { libgsm_init, libgsm_encode_frame, libgsm_close, - .long_name = "libgsm GSM", + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), }; AVCodec libgsm_ms_encoder = { @@ -128,7 +128,7 @@ AVCodec libgsm_ms_encoder = { libgsm_init, libgsm_encode_frame, libgsm_close, - .long_name = "libgsm GSM Microsoft variant", + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), }; static int libgsm_decode_frame(AVCodecContext *avctx, @@ -158,7 +158,7 @@ AVCodec libgsm_decoder = { NULL, libgsm_close, libgsm_decode_frame, - .long_name = "libgsm GSM", + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"), }; AVCodec libgsm_ms_decoder = { @@ -170,5 +170,5 @@ AVCodec libgsm_ms_decoder = { NULL, libgsm_close, libgsm_decode_frame, - .long_name = "libgsm GSM Microsoft variant", + .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"), }; diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index d1e9fcf..13a658a 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -218,5 +218,5 @@ AVCodec libmp3lame_encoder = { MP3lame_encode_frame, MP3lame_encode_close, .capabilities= CODEC_CAP_DELAY, - .long_name= "libmp3lame MP3 (MPEG audio layer 3)", + .long_name= NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), }; diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 5a07899..5dde11a 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -305,5 +305,5 @@ AVCodec libschroedinger_decoder = { libschroedinger_decode_frame, CODEC_CAP_DELAY, .flush = libschroedinger_flush, - .long_name = "libschroedinger Dirac 2.2", + .long_name = NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), }; diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c index c895862..136b362 100644 --- a/libavcodec/libschroedingerenc.c +++ b/libavcodec/libschroedingerenc.c @@ -384,5 +384,5 @@ AVCodec libschroedinger_encoder = { libschroedinger_encode_close, .capabilities= CODEC_CAP_DELAY, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE}, - .long_name= "libschroedinger Dirac 2.2", + .long_name= NULL_IF_CONFIG_SMALL("libschroedinger Dirac 2.2"), }; diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index d516d44..d7f635c 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -277,5 +277,5 @@ AVCodec libtheora_encoder = .close = encode_close, .encode = encode_frame, .pix_fmts = supported_pixel_formats, - .long_name = "libtheora Theora", + .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"), }; diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c index 78bc6cb..f1eb5a1 100644 --- a/libavcodec/libvorbis.c +++ b/libavcodec/libvorbis.c @@ -217,5 +217,5 @@ AVCodec libvorbis_encoder = { oggvorbis_encode_frame, oggvorbis_encode_close, .capabilities= CODEC_CAP_DELAY, - .long_name= "libvorbis Vorbis", + .long_name= NULL_IF_CONFIG_SMALL("libvorbis Vorbis"), } ; diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index c02a696..e885f07 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -301,5 +301,5 @@ AVCodec libx264_encoder = { .close = X264_close, .capabilities = CODEC_CAP_DELAY, .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE }, - .long_name = "libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10", + .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), }; diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index bc4359a..aa55bf3 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -778,5 +778,5 @@ AVCodec libxvid_encoder = { ff_xvid_encode_frame, ff_xvid_encode_close, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "libxvidcore MPEG-4 part 2", + .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), }; diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index cbe1afc..7ac013e 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -194,5 +194,5 @@ AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them MPV_encode_init, encode_picture_lossless, MPV_encode_end, - .long_name = "Lossless JPEG", + .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"), }; diff --git a/libavcodec/loco.c b/libavcodec/loco.c index fcf9315..ad5737e 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -282,5 +282,5 @@ AVCodec loco_decoder = { NULL, decode_frame, CODEC_CAP_DR1, - .long_name = "LOCO", + .long_name = NULL_IF_CONFIG_SMALL("LOCO"), }; diff --git a/libavcodec/mace.c b/libavcodec/mace.c index a3f7898..2e15e91 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -437,7 +437,7 @@ AVCodec mace3_decoder = { NULL, NULL, mace_decode_frame, - .long_name = "MACE (Macintosh Audio Compression/Expansion) 3:1", + .long_name = NULL_IF_CONFIG_SMALL("MACE (Macintosh Audio Compression/Expansion) 3:1"), }; AVCodec mace6_decoder = { @@ -449,6 +449,6 @@ AVCodec mace6_decoder = { NULL, NULL, mace_decode_frame, - .long_name = "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 1105acf..9053f48 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -267,6 +267,6 @@ AVCodec mdec_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name="Sony PlayStation MDEC (Motion DECoder)", + .long_name= NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), }; diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index bbb9229..527c7bcd 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -386,5 +386,5 @@ AVCodec mimic_decoder = { mimic_decode_end, mimic_decode_frame, CODEC_CAP_DR1, - .long_name = "Mimic", + .long_name = NULL_IF_CONFIG_SMALL("Mimic"), }; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 99d39a4..4a6c0d8 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -146,5 +146,5 @@ AVCodec mjpegb_decoder = { mjpegb_decode_frame, CODEC_CAP_DR1, NULL, - .long_name = "Apple MJPEG-B", + .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"), }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index a8929fc..7e6b0d5 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1364,7 +1364,7 @@ AVCodec mjpeg_decoder = { ff_mjpeg_decode_frame, CODEC_CAP_DR1, NULL, - .long_name = "MJPEG (Motion JPEG)", + .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), }; AVCodec thp_decoder = { @@ -1378,5 +1378,5 @@ AVCodec thp_decoder = { ff_mjpeg_decode_frame, CODEC_CAP_DR1, NULL, - .long_name = "Nintendo Gamecube THP video", + .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), }; diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d131195..d5fe08d 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -455,5 +455,5 @@ AVCodec mjpeg_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE}, - .long_name= "MJPEG (Motion JPEG)", + .long_name= NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), }; diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 0280a98..e23b664 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -202,5 +202,5 @@ AVCodec mmvideo_decoder = { mm_decode_end, mm_decode_frame, CODEC_CAP_DR1, - .long_name = "American Laser Games MM Video", + .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM Video"), }; diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 4c598e9..a975db3 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -273,5 +273,5 @@ AVCodec mpc7_decoder = { NULL, mpc7_decode_frame, .flush = mpc7_decode_flush, - .long_name = "Musepack SV7", + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"), }; diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 756e7f4..55fe942 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -361,5 +361,5 @@ AVCodec mpc8_decoder = { NULL, NULL, mpc8_decode_frame, - .long_name = "Musepack SV8", + .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"), }; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d42d8a1..bb59f54 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2445,7 +2445,7 @@ AVCodec mpeg1video_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, - .long_name= "MPEG-1 video", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; AVCodec mpeg2video_decoder = { @@ -2459,7 +2459,7 @@ AVCodec mpeg2video_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, - .long_name= "MPEG-2 video", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"), }; //legacy decoder @@ -2474,7 +2474,7 @@ AVCodec mpegvideo_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, - .long_name= "MPEG-1 video", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; #ifdef HAVE_XVMC @@ -2508,7 +2508,7 @@ AVCodec mpeg_xvmc_decoder = { mpeg_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED| CODEC_CAP_HWACCEL | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, - .long_name = "MPEG-1 video XvMC (X-Video Motion Compensation)", + .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video XvMC (X-Video Motion Compensation)"), }; #endif diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 689a9ea..fa7e098 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -938,7 +938,7 @@ AVCodec mpeg1video_encoder = { .supported_framerates= ff_frame_rate_tab+1, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .capabilities= CODEC_CAP_DELAY, - .long_name= "MPEG-1 video", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-1 video"), }; AVCodec mpeg2video_encoder = { @@ -952,5 +952,5 @@ AVCodec mpeg2video_encoder = { .supported_framerates= ff_frame_rate_tab+1, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE}, .capabilities= CODEC_CAP_DELAY, - .long_name= "MPEG-2 video", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-2 video"), }; diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index c4805be..43d70f1 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -2640,7 +2640,7 @@ AVCodec mp2_decoder = decode_frame, CODEC_CAP_PARSE_ONLY, .flush= flush, - .long_name= "MP2 (MPEG audio layer 2)", + .long_name= NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), }; #endif #ifdef CONFIG_MP3_DECODER @@ -2656,7 +2656,7 @@ AVCodec mp3_decoder = decode_frame, CODEC_CAP_PARSE_ONLY, .flush= flush, - .long_name= "MP3 (MPEG audio layer 3)", + .long_name= NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), }; #endif #ifdef CONFIG_MP3ADU_DECODER @@ -2672,7 +2672,7 @@ AVCodec mp3adu_decoder = decode_frame_adu, CODEC_CAP_PARSE_ONLY, .flush= flush, - .long_name= "ADU (Application Data Unit) MP3 (MPEG audio layer 3)", + .long_name= NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), }; #endif #ifdef CONFIG_MP3ON4_DECODER @@ -2687,6 +2687,6 @@ AVCodec mp3on4_decoder = decode_close_mp3on4, decode_frame_mp3on4, .flush= flush, - .long_name= "MP3onMP4", + .long_name= NULL_IF_CONFIG_SMALL("MP3onMP4"), }; #endif diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index a67ca21..07b5509 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -796,7 +796,7 @@ AVCodec mp2_encoder = { MPA_encode_frame, MPA_encode_close, NULL, - .long_name = "MP2 (MPEG audio layer 2)", + .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), }; #undef FIX diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d904afd..0e8e6d8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3749,7 +3749,7 @@ AVCodec h263_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "H.263", + .long_name= NULL_IF_CONFIG_SMALL("H.263"), }; AVCodec h263p_encoder = { @@ -3761,7 +3761,7 @@ AVCodec h263p_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "H.263+ / H.263 version 2", + .long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263 version 2"), }; AVCodec flv_encoder = { @@ -3773,7 +3773,7 @@ AVCodec flv_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "Flash Video", + .long_name= NULL_IF_CONFIG_SMALL("Flash Video"), }; AVCodec rv10_encoder = { @@ -3785,7 +3785,7 @@ AVCodec rv10_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "RealVideo 1.0", + .long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"), }; AVCodec rv20_encoder = { @@ -3797,7 +3797,7 @@ AVCodec rv20_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "RealVideo 2.0", + .long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"), }; AVCodec mpeg4_encoder = { @@ -3810,7 +3810,7 @@ AVCodec mpeg4_encoder = { MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .capabilities= CODEC_CAP_DELAY, - .long_name= "MPEG-4 part 2", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), }; AVCodec msmpeg4v1_encoder = { @@ -3822,7 +3822,7 @@ AVCodec msmpeg4v1_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "MPEG-4 part 2 Microsoft variant version 1", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"), }; AVCodec msmpeg4v2_encoder = { @@ -3834,7 +3834,7 @@ AVCodec msmpeg4v2_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "MPEG-4 part 2 Microsoft variant version 2", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"), }; AVCodec msmpeg4v3_encoder = { @@ -3846,7 +3846,7 @@ AVCodec msmpeg4v3_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "MPEG-4 part 2 Microsoft variant version 3", + .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"), }; AVCodec wmv1_encoder = { @@ -3858,5 +3858,5 @@ AVCodec wmv1_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "Windows Media Video 7", + .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), }; diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index a55b578..ceffae8 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -304,5 +304,5 @@ AVCodec msrle_decoder = { msrle_decode_end, msrle_decode_frame, CODEC_CAP_DR1, - .long_name= "Microsoft RLE", + .long_name= NULL_IF_CONFIG_SMALL("Microsoft RLE"), }; diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 854f36f..8621d66 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -339,5 +339,5 @@ AVCodec msvideo1_decoder = { msvideo1_decode_end, msvideo1_decode_frame, CODEC_CAP_DR1, - .long_name= "Microsoft Video 1", + .long_name= NULL_IF_CONFIG_SMALL("Microsoft Video 1"), }; diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 07136b1..5db963e 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -206,6 +206,6 @@ AVCodec nellymoser_decoder = { NULL, decode_end, decode_tag, - .long_name = "Nellymoser Asao", + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), }; diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 5953121..189a4e9 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -270,6 +270,6 @@ AVCodec nuv_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "NuppelVideo", + .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo"), }; diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 065f27a..6e9a755 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -530,7 +530,7 @@ AVCodec name ## _encoder = { \ pcm_encode_frame, \ pcm_encode_close, \ NULL, \ - .long_name = long_name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; #else #define PCM_ENCODER(id,name,long_name_) @@ -547,7 +547,7 @@ AVCodec name ## _decoder = { \ NULL, \ NULL, \ pcm_decode_frame, \ - .long_name = long_name_, \ + .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ }; #else #define PCM_DECODER(id,name,long_name_) diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c index 946d382..bf80e43 100644 --- a/libavcodec/pcx.c +++ b/libavcodec/pcx.c @@ -244,5 +244,5 @@ AVCodec pcx_decoder = { pcx_decode_frame, 0, NULL, - .long_name = "PC Paintbrush PCX image", + .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), }; diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 89c20e5..14c6720 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -618,5 +618,5 @@ AVCodec png_decoder = { decode_frame, 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/, NULL, - .long_name = "PNG image", + .long_name = NULL_IF_CONFIG_SMALL("PNG image"), }; diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 74376af..ea7139c 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -445,5 +445,5 @@ AVCodec png_encoder = { encode_frame, NULL, //encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_NONE}, - .long_name= "PNG image", + .long_name= NULL_IF_CONFIG_SMALL("PNG image"), }; diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 7ea286a..b62ea75 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -365,7 +365,7 @@ AVCodec pgm_encoder = { NULL, //encode_end, pnm_decode_frame, .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, - .long_name= "PGM (Portable GrayMap) image", + .long_name= NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif // CONFIG_PGM_ENCODER @@ -380,7 +380,7 @@ AVCodec pgmyuv_encoder = { NULL, //encode_end, pnm_decode_frame, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "PGMYUV (Portable GrayMap YUV) image", + .long_name= NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif // CONFIG_PGMYUV_ENCODER @@ -395,7 +395,7 @@ AVCodec ppm_encoder = { NULL, //encode_end, pnm_decode_frame, .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_NONE}, - .long_name= "PPM (Portable PixelMap) image", + .long_name= NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif // CONFIG_PPM_ENCODER @@ -410,7 +410,7 @@ AVCodec pbm_encoder = { NULL, //encode_end, pnm_decode_frame, .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, - .long_name= "PBM (Portable BitMap) image", + .long_name= NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif // CONFIG_PBM_ENCODER @@ -425,6 +425,6 @@ AVCodec pam_encoder = { NULL, //encode_end, pnm_decode_frame, .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, - .long_name= "PAM (Portable AnyMap) image", + .long_name= NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif // CONFIG_PAM_ENCODER diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 294d14e..79424b9 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -114,5 +114,5 @@ AVCodec ptx_decoder = { ptx_decode_frame, 0, NULL, - .long_name = "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 114b978..ecc9428 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -2038,5 +2038,5 @@ AVCodec qdm2_decoder = .init = qdm2_decode_init, .close = qdm2_decode_close, .decode = qdm2_decode_frame, - .long_name = "QDesign Music Codec 2", + .long_name = NULL_IF_CONFIG_SMALL("QDesign Music Codec 2"), }; diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index 23b8dda..e0e4142 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -151,5 +151,5 @@ AVCodec qdraw_decoder = { NULL, decode_frame, CODEC_CAP_DR1, - .long_name = "Apple QuickDraw", + .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), }; diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 8fe89ef..36c864c 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -316,5 +316,5 @@ AVCodec qpeg_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "Q-team QPEG", + .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"), }; diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 4b0f38f..0aff473 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -620,6 +620,6 @@ AVCodec qtrle_decoder = { qtrle_decode_end, qtrle_decode_frame, CODEC_CAP_DR1, - .long_name = "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 c112332..6cea662 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -323,5 +323,5 @@ AVCodec qtrle_encoder = { qtrle_encode_frame, qtrle_encode_end, .pix_fmts = (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_NONE}, - .long_name = "QuickTime Animation (RLE) video", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), }; diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index a947178..c679a6d 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -396,5 +396,5 @@ AVCodec ra_144_decoder = NULL, NULL, ra144_decode_frame, - .long_name = "RealAudio 1.0 (14.4K)", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"), }; diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index b6ee698..b78af22 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -255,5 +255,5 @@ AVCodec ra_288_decoder = NULL, NULL, ra288_decode_frame, - .long_name = "RealAudio 2.0 (28.8K)", + .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"), }; diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index f03b1a2..45f8f98 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -162,5 +162,5 @@ AVCodec rawvideo_decoder = { NULL, raw_close_decoder, raw_decode, - .long_name = "raw video", + .long_name = NULL_IF_CONFIG_SMALL("raw video"), }; diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index 7e3d00b..24f2580 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -51,5 +51,5 @@ AVCodec rawvideo_encoder = { sizeof(AVFrame), raw_init_encoder, raw_encode, - .long_name = "raw video", + .long_name = NULL_IF_CONFIG_SMALL("raw video"), }; diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index d9b7d64..ad830e7 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -236,6 +236,6 @@ AVCodec rl2_decoder = { rl2_decode_end, rl2_decode_frame, CODEC_CAP_DR1, - .long_name = "RL2 video", + .long_name = NULL_IF_CONFIG_SMALL("RL2 video"), }; diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index d638f9d..6c40e90 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -174,5 +174,5 @@ AVCodec roq_dpcm_encoder = { roq_dpcm_encode_frame, roq_dpcm_encode_close, NULL, - .long_name = "id RoQ DPCM", + .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"), }; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 65dac91..98498b5 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -219,5 +219,5 @@ AVCodec roq_decoder = { roq_decode_end, roq_decode_frame, CODEC_CAP_DR1, - .long_name = "Id RoQ video", + .long_name = NULL_IF_CONFIG_SMALL("Id RoQ video"), }; diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index e742938..013821c 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -1066,5 +1066,5 @@ AVCodec roq_encoder = roq_encode_end, .supported_framerates = (AVRational[]){{30,1}, {0,0}}, .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV444P, PIX_FMT_NONE}, - .long_name = "id RoQ video", + .long_name = NULL_IF_CONFIG_SMALL("id RoQ video"), }; diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index 46789e8..ddf3954 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -283,5 +283,5 @@ AVCodec rpza_decoder = { rpza_decode_end, rpza_decode_frame, CODEC_CAP_DR1, - .long_name = "QuickTime video (RPZA)", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"), }; diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index ba8e83d..7a031ae 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -785,7 +785,7 @@ AVCodec rv10_decoder = { rv10_decode_end, rv10_decode_frame, CODEC_CAP_DR1, - .long_name = "RealVideo 1.0", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 1.0"), }; AVCodec rv20_decoder = { @@ -799,6 +799,6 @@ AVCodec rv20_decoder = { rv10_decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DELAY, .flush= ff_mpeg_flush, - .long_name = "RealVideo 2.0", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), }; diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index e871b53..2cd12bc 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -144,5 +144,5 @@ AVCodec rv30_decoder = { ff_rv34_decode_end, ff_rv34_decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = "RealVideo 3.0", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), }; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 71bce93..2d52967 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -276,5 +276,5 @@ AVCodec rv40_decoder = { ff_rv34_decode_end, ff_rv34_decode_frame, CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = "RealVideo 4.0", + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), }; diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index 34f949d..f6ca743 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -263,6 +263,6 @@ AVCodec sgi_decoder = { NULL, sgi_end, decode_frame, - .long_name = "SGI image", + .long_name = NULL_IF_CONFIG_SMALL("SGI image"), }; diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c index c85c9a4..f4d651e 100644 --- a/libavcodec/sgienc.c +++ b/libavcodec/sgienc.c @@ -152,6 +152,6 @@ AVCodec sgi_encoder = { encode_frame, NULL, .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_NONE}, - .long_name= "SGI image", + .long_name= NULL_IF_CONFIG_SMALL("SGI image"), }; diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 874ae32..7516c65 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -532,5 +532,5 @@ AVCodec shorten_decoder = { shorten_decode_close, shorten_decode_frame, .flush= shorten_flush, - .long_name= "Shorten", + .long_name= NULL_IF_CONFIG_SMALL("Shorten"), }; diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 62e78bd..5e3b6df 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -698,7 +698,7 @@ AVCodec smacker_decoder = { NULL, decode_end, decode_frame, - .long_name = "Smacker video", + .long_name = NULL_IF_CONFIG_SMALL("Smacker video"), }; AVCodec smackaud_decoder = { @@ -710,6 +710,6 @@ AVCodec smackaud_decoder = { NULL, NULL, smka_decode_frame, - .long_name = "Smacker audio", + .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"), }; diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 7227096..e05e0b1 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -484,5 +484,5 @@ AVCodec smc_decoder = { smc_decode_end, smc_decode_frame, CODEC_CAP_DR1, - .long_name = "QuickTime Graphics (SMC)", + .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"), }; diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 4d1bb70..dd736b4 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -4661,7 +4661,7 @@ AVCodec snow_decoder = { decode_frame, 0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/, NULL, - .long_name = "Snow", + .long_name = NULL_IF_CONFIG_SMALL("Snow"), }; #ifdef CONFIG_SNOW_ENCODER @@ -4673,7 +4673,7 @@ AVCodec snow_encoder = { encode_init, encode_frame, encode_end, - .long_name = "Snow", + .long_name = NULL_IF_CONFIG_SMALL("Snow"), }; #endif diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index f9086e7..ee5ecd4 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -946,7 +946,7 @@ AVCodec sonic_encoder = { sonic_encode_frame, sonic_encode_close, NULL, - .long_name = "Sonic", + .long_name = NULL_IF_CONFIG_SMALL("Sonic"), }; AVCodec sonic_ls_encoder = { @@ -958,7 +958,7 @@ AVCodec sonic_ls_encoder = { sonic_encode_frame, sonic_encode_close, NULL, - .long_name = "Sonic lossless", + .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"), }; #endif @@ -972,6 +972,6 @@ AVCodec sonic_decoder = { NULL, sonic_decode_close, sonic_decode_frame, - .long_name = "Sonic", + .long_name = NULL_IF_CONFIG_SMALL("Sonic"), }; #endif diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 0e4df95..6ef19a9 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -199,7 +199,7 @@ AVCodec sp5x_decoder = { sp5x_decode_frame, CODEC_CAP_DR1, NULL, - .long_name = "Sunplus JPEG (SP5X)" + .long_name = NULL_IF_CONFIG_SMALL("Sunplus JPEG (SP5X)"), }; AVCodec amv_decoder = { @@ -211,5 +211,5 @@ AVCodec amv_decoder = { NULL, ff_mjpeg_decode_end, sp5x_decode_frame, - .long_name = "AMV Video", + .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), }; diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 3bb1998..c8f021f 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -192,5 +192,5 @@ AVCodec sunrast_decoder = { sunrast_decode_frame, 0, NULL, - .long_name = "Sun Rasterfile image", + .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"), }; diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index fd96074..e693fb6 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -826,5 +826,5 @@ AVCodec svq1_decoder = { CODEC_CAP_DR1, .flush= ff_mpeg_flush, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, - .long_name= "Sorenson Vector Quantizer 1", + .long_name= NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1"), }; diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index a9713ea..8d0bca5 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -585,5 +585,5 @@ AVCodec svq1_encoder = { svq1_encode_frame, svq1_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE}, - .long_name= "Sorenson Vector Quantizer 1", + .long_name= NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1"), }; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 340ca12..6333d30 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -983,5 +983,5 @@ AVCodec svq3_decoder = { decode_end, svq3_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_DELAY, - .long_name = "Sorenson Vector Quantizer 3", + .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3"), }; diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 9c7bad8..f9bc343 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -250,5 +250,5 @@ AVCodec targa_decoder = { decode_frame, 0, NULL, - .long_name = "Truevision Targa image", + .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c index 35e6679..958ae50 100644 --- a/libavcodec/targaenc.c +++ b/libavcodec/targaenc.c @@ -156,5 +156,5 @@ AVCodec targa_encoder = { .init = targa_encode_init, .encode = targa_encode_frame, .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, PIX_FMT_NONE}, - .long_name= "Truevision Targa image", + .long_name= NULL_IF_CONFIG_SMALL("Truevision Targa image"), }; diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index 11766cb..723d946 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -227,5 +227,5 @@ AVCodec tiertexseqvideo_decoder = { seqvideo_decode_end, seqvideo_decode_frame, CODEC_CAP_DR1, - .long_name = "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 6cda29d..7e42aab 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -496,5 +496,5 @@ AVCodec tiff_decoder = { decode_frame, 0, NULL, - .long_name = "TIFF image", + .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), }; diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 1ec27ef..c440454 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -458,5 +458,5 @@ AVCodec tiff_encoder = { PIX_FMT_YUV444P, PIX_FMT_YUV410P, PIX_FMT_YUV411P, PIX_FMT_NONE}, - .long_name = "TIFF image", + .long_name = NULL_IF_CONFIG_SMALL("TIFF image"), }; diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 721b3f0..ac9ba0a 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -899,5 +899,5 @@ AVCodec truemotion1_decoder = { truemotion1_decode_end, truemotion1_decode_frame, CODEC_CAP_DR1, - .long_name = "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 5ed624c..d1d3f71 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -887,5 +887,5 @@ AVCodec truemotion2_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "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 8d2c462..8311835 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -380,5 +380,5 @@ AVCodec truespeech_decoder = { NULL, NULL, truespeech_decode_frame, - .long_name = "DSP Group TrueSpeech", + .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"), }; diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 3844725..3c9adc0 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -341,6 +341,6 @@ AVCodec tscc_decoder = { decode_end, decode_frame, CODEC_CAP_DR1, - .long_name = "TechSmith Screen Capture Codec", + .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"), }; diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 55138a3..6e22bd9 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -443,5 +443,5 @@ AVCodec tta_decoder = { NULL, tta_decode_close, tta_decode_frame, - .long_name = "True Audio", + .long_name = NULL_IF_CONFIG_SMALL("True Audio"), }; diff --git a/libavcodec/txd.c b/libavcodec/txd.c index 2a4f790..284b00d 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -163,5 +163,5 @@ AVCodec txd_decoder = { txd_decode_frame, 0, NULL, - .long_name = "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 01c0bf9..882d05f 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -411,6 +411,6 @@ AVCodec ulti_decoder = { ulti_decode_frame, CODEC_CAP_DR1, NULL, - .long_name = "IBM UltiMotion", + .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"), }; diff --git a/libavcodec/vb.c b/libavcodec/vb.c index b448755..e0a5874 100644 --- a/libavcodec/vb.c +++ b/libavcodec/vb.c @@ -278,6 +278,6 @@ AVCodec vb_decoder = { NULL, decode_end, decode_frame, - .long_name = "Beam Software VB", + .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"), }; diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 8549e39..3975d04 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -4137,7 +4137,7 @@ AVCodec vc1_decoder = { vc1_decode_frame, CODEC_CAP_DELAY, NULL, - .long_name = "SMPTE VC-1", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), }; AVCodec wmv3_decoder = { @@ -4151,5 +4151,5 @@ AVCodec wmv3_decoder = { vc1_decode_frame, CODEC_CAP_DELAY, NULL, - .long_name = "Windows Media Video 9", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), }; diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index f316c8f..73da86d 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -172,7 +172,7 @@ AVCodec vcr1_decoder = { NULL, decode_frame, CODEC_CAP_DR1, - .long_name = "ATI VCR1", + .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; #if 0 #ifdef CONFIG_ENCODERS @@ -185,7 +185,7 @@ AVCodec vcr1_encoder = { encode_init, encode_frame, //encode_end, - .long_name = "ATI VCR1", + .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; #endif //CONFIG_ENCODERS diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c index 0732eac..88bf7d9 100644 --- a/libavcodec/vmdav.c +++ b/libavcodec/vmdav.c @@ -561,7 +561,7 @@ AVCodec vmdvideo_decoder = { vmdvideo_decode_end, vmdvideo_decode_frame, CODEC_CAP_DR1, - .long_name = "Sierra VMD video", + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"), }; AVCodec vmdaudio_decoder = { @@ -573,5 +573,5 @@ AVCodec vmdaudio_decoder = { NULL, NULL, vmdaudio_decode_frame, - .long_name = "Sierra VMD audio", + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"), }; diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index 1b26dc1..d7dd974 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -518,6 +518,6 @@ AVCodec vmnc_decoder = { NULL, decode_end, decode_frame, - .long_name = "VMware Screen Codec / VMware Video", + .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), }; diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 5cce320..299c787 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -1634,6 +1634,6 @@ AVCodec vorbis_decoder = { NULL, vorbis_decode_close, vorbis_decode_frame, - .long_name = "Vorbis", + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), }; diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c index 2df9464..0a997a6 100644 --- a/libavcodec/vorbis_enc.c +++ b/libavcodec/vorbis_enc.c @@ -1084,5 +1084,5 @@ AVCodec vorbis_encoder = { vorbis_encode_frame, vorbis_encode_close, .capabilities= CODEC_CAP_DELAY, - .long_name = "Vorbis", + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), }; diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 846a30e..1366666 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2620,7 +2620,7 @@ AVCodec theora_decoder = { vp3_decode_frame, 0, NULL, - .long_name = "Theora", + .long_name = NULL_IF_CONFIG_SMALL("Theora"), }; #endif @@ -2635,5 +2635,5 @@ AVCodec vp3_decoder = { vp3_decode_frame, 0, NULL, - .long_name = "On2 VP3", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"), }; diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 4cbd68b..4f9d42f 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -292,5 +292,5 @@ AVCodec vp5_decoder = { vp56_free, vp56_decode_frame, CODEC_CAP_DR1, - .long_name = "On2 VP5", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), }; diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 1b9fd05..74c62ff 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -638,7 +638,7 @@ AVCodec vp6_decoder = { vp56_free, vp56_decode_frame, CODEC_CAP_DR1, - .long_name = "On2 VP6", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), }; /* flash version, not flipped upside-down */ @@ -652,7 +652,7 @@ AVCodec vp6f_decoder = { vp56_free, vp56_decode_frame, CODEC_CAP_DR1, - .long_name = "On2 VP6 (Flash version)" + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), }; /* flash version, not flipped upside-down, with alpha channel */ @@ -666,5 +666,5 @@ AVCodec vp6a_decoder = { vp56_free, vp56_decode_frame, CODEC_CAP_DR1, - .long_name = "On2 VP6 (Flash version, with alpha channel)", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), }; diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 3455fe7..028895f 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -616,5 +616,5 @@ AVCodec vqa_decoder = { vqa_decode_end, vqa_decode_frame, CODEC_CAP_DR1, - .long_name = "Westwood Studios VQA (Vector Quantized Animation) video", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA (Vector Quantized Animation) video"), }; diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 7035fc0..660c78a 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -582,5 +582,5 @@ AVCodec wavpack_decoder = { NULL, NULL, wavpack_decode_frame, - .long_name = "WavPack", + .long_name = NULL_IF_CONFIG_SMALL("WavPack"), }; diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index e622b23..361a73d 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -862,7 +862,7 @@ AVCodec wmav1_decoder = NULL, ff_wma_end, wma_decode_superframe, - .long_name = "Windows Media Audio 1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), }; AVCodec wmav2_decoder = @@ -875,5 +875,5 @@ AVCodec wmav2_decoder = NULL, ff_wma_end, wma_decode_superframe, - .long_name = "Windows Media Audio 2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), }; diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index d050900..0fa17e2 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -387,7 +387,7 @@ AVCodec wmav1_encoder = encode_init, encode_superframe, ff_wma_end, - .long_name = "Windows Media Audio 1", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"), }; AVCodec wmav2_encoder = @@ -399,5 +399,5 @@ AVCodec wmav2_encoder = encode_init, encode_superframe, ff_wma_end, - .long_name = "Windows Media Audio 2", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"), }; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index e497438..696d73b 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -492,5 +492,5 @@ AVCodec wmv2_decoder = { wmv2_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = "Windows Media Video 8", + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), }; diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index c7b8899..a31a05a 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -237,5 +237,5 @@ AVCodec wmv2_encoder = { MPV_encode_picture, MPV_encode_end, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= "Windows Media Video 8", + .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 8"), }; diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index d4b01ac..bc5d69a 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -141,5 +141,5 @@ AVCodec wnv1_decoder = { NULL, decode_frame, CODEC_CAP_DR1, - .long_name = "Winnov WNV1", + .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), }; diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index dc6ef37..18911c7 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -149,5 +149,5 @@ AVCodec ws_snd1_decoder = { NULL, NULL, ws_snd_decode_frame, - .long_name = "Westwood Audio (SND1)", + .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"), }; diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 08e88ca..12b00b1 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -471,7 +471,7 @@ AVCodec xan_wc3_decoder = { xan_decode_end, xan_decode_frame, CODEC_CAP_DR1, - .long_name = "Wing Commander III / Xan", + .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III / Xan"), }; /* diff --git a/libavcodec/xl.c b/libavcodec/xl.c index 5e2dc57..b6911dd 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -135,5 +135,5 @@ AVCodec xl_decoder = { NULL, decode_frame, CODEC_CAP_DR1, - .long_name = "Miro VideoXL", + .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), }; diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index d9740c0..5f7d8fd 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -133,5 +133,5 @@ AVCodec xsub_decoder = { NULL, NULL, decode_frame, - .long_name = "XSUB", + .long_name = NULL_IF_CONFIG_SMALL("XSUB"), }; diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 51079fa..b9751a0 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -662,6 +662,6 @@ AVCodec zmbv_decoder = { NULL, decode_end, decode_frame, - .long_name = "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 a12c014..a6b51ba 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -330,5 +330,5 @@ AVCodec zmbv_encoder = { encode_frame, encode_end, .pix_fmts = (enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE}, - .long_name = "Zip Motion Blocks Video", + .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"), }; |
