Make AVCodec long_names definition conditional depending on CONFIG_SMALL.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13759 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 9eea643d833c114c990b768dc10f7465097df8f0..0fc7a2e6d8c5ce7e4d79e99401968de03496eea4 100644 (file)
--- 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 3b248c9cea58b998128b85aaeca51efc9ecf62ba..447d46064c00849057fc79b57b47d80c0a58381d 100644 (file)
--- 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 cdbd6b791f3fe6669b6ebe10fa8c3693ee91164e..660f00ccf8e2b8f8121fc021b9a902e2fe1d7855 100644 (file)
--- 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 1e599e0daa889528f76c4526acbdc70ef5051d05..01172018c76b3bc5ae6b2a7d1daf04a578be46e4 100644 (file)
--- 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 9bdfacdf42d2a7c2a049a4f806e54a9d63706301..bd1310b1c45a115ac2ad23cb274bc7e9134b8657 100644 (file)
--- 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 b1710557158b24ffa71848140431d7a5063e726d..b4410b3cd1f22705a4e1b8e223ba9c4c0801bfd8 100644 (file)
--- 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 f66274e8291ffb33854bc1a27e19a83bd4d07e06..99ea285c687865cd7b19a4ea6c8262f09dd751f1 100644 (file)
--- 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 13ff33d33e3f4a8af8c18c833dabae6c93b3ddec..91331c04b1804447a47a375c7cf80e8032f3040e 100644 (file)
--- 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 e5d405a059e0843581dd3abd23371917b0a753af..927ecd7b1a5d5bd4c8b0431ca10112df5087dfb0 100644 (file)
--- 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 85fb24669b5837258aa0b2ba92fae7842116015c..e704565e8de69b59057b63a11faa09b6eb9b7c05 100644 (file)
--- 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 60c12b169cbd2bbfbef73f24f44e3db6ca7ffd43..4cc90f234ac6e06c70a71768b2fd53640f802e5c 100644 (file)
--- 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 bed7e75f5417cb4d6f58ae7c4c47c39358b6ef64..7bf93fbf382563f2d2c54a6bd170c5d903153b8f 100644 (file)
--- 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 957d56bc25ad2543110c338e2dab51989a75c646..7bf3ec27f4111ce3780a7c39d18f9416844aff36 100644 (file)
--- 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 d7dbe1586823e78cac4a7960270a5974759848ab..19b7e56dc6dc4950f9c579716fddae8222392f02 100644 (file)
--- 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 79bfeb1e4475c8e7c3e620b03ffa30a9afe54f2a..c60fe63e33923909dd0ef86ac5a2b5ad8f7a74b1 100644 (file)
--- 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 08808c4b35dadc1ed91ffec1e6ae673a889891f5..69d08b4f66a3944d967c1c686f55e8d9dbbb5ddd 100644 (file)
--- 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 c3f23000045d82a0dec3331384af204aebd046a3..eaea8085125fc568250915bdeb9d5e5b6d3da017 100644 (file)
--- 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 f97b5e5b5cacb53521d2751099772b7a1e8a163c..16a5e928256f295667083f87ab850b5da6afd92f 100644 (file)
--- 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 0cee7c61ab6092dc6df173417d5e85ab8607a435..a54355c4bfb46f0bcb46097c666b252ad4b72a20 100644 (file)
--- 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 ae144f02b747e52e8cee630260c2c60b68748150..18ed7afcb4f8d85e065f49ca7c8d638fb892dcfd 100644 (file)
--- 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 b212eb93c49f26f346129c4003bf95c07fedf800..a978fe1a1a92f916b75ba8047a40e6f0e5c6a4c8 100644 (file)
--- 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 ad3823f828d76dfaabfb3abb65d9191b14c875f0..b83edd19afe0297756f6f050b4431bfed8cd7adf 100644 (file)
--- 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 b0de30c06c29c8e14556a44a4f856498d09da3fc..ddc00583d13fce8faf0856c96174e3dbbfee6818 100644 (file)
--- 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 3b7a4fd51bedfc983b472c37dbd82a66f91c0ca2..fa945ec8411575d105e77e8cc028d169730e76fe 100644 (file)
--- 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 39f4bd4b372621ecc947f07f9e95d850fa27e05a..2999d443c5a20b195f4fb94263bceba914073d08 100644 (file)
--- 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 26bf7550dbe99bc68c01192b8cd7da46ccad1183..d64f6df275603beac69ed6c6e2695aabb2cf769e 100644 (file)
--- 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 acbdb918941f1ad5cffaae7ed6f0a1e2e09a7309..8770def7443bd971b4d02479b352acfa68767fe5 100644 (file)
--- 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 593ee95c3158d381889a2f140bb1bea69ccb4c19..1f4f1c861b688af7ad84fa036db2372c53002908 100644 (file)
--- 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 84a56e7ff709c4fa75c4772f5a03471c207f21df..6b1a214f726e5742d93c31c62ece4ed147bcdd10 100644 (file)
--- 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 b8fecf7d54051183725251ec5118a0e6f2da4579..468a7434fcdeb8c9ead9efce645bbbb535fe8623 100644 (file)
--- 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 3ff6d04d4a043b5357f9e9ebd988b0a7f8385114..2cd5db85254ae4a5c5c76026e4ba8d6f82b0759d 100644 (file)
--- 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 692ab59d9eb4edbdae7208592ec1e864d9aef095..0f2872929cc21d91de9f24ac6a6d5a20b58186aa 100644 (file)
--- 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 f7a719a04587d73eddb5811c9ec965a50d6a2cea..d7cb2c4d9509bad3e720c25d141148294e00eaf3 100644 (file)
--- 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 47fea45ea6a1bc1f2697180638216219c95e40f4..3f47c1b4d6f0420122fad5543ae2f347e6fc51c4 100644 (file)
--- 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 1421c6b6e930de97832e40d42c84b7310ac5beaa..29f9adf588554f8773176d0e5e1bc01027934030 100644 (file)
--- 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 0859ee24e4e841a8fba581d568b021a12ed1c287..a5380ceefd5a49cceb17d2839956651ad33e2ac4 100644 (file)
--- 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 2df987ab076d6d3d6bbb3a300ed4f5585bd3fce8..3d03445c0c7185456d6a7660ee42bb910691f7c3 100644 (file)
--- 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 378e4145e2385ca35227d16dbc511e5c3f024ce3..90ba4795ebc6fdea74a8ac96a232951f171c471c 100644 (file)
--- 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 0dc7c07df5222eea84f7299f0ad9e60af7a703a3..133347ee0c5d7e60c898e6092ec1df44822e9a0c 100644 (file)
--- 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 0a590370d484975b420d2621dac47e7302b40d1f..5896debe31c187b622dab4fe950658c24c4144fd 100644 (file)
--- 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 9b798d1ab180d43b9fbe7be36c4e05beef7f61f9..34fdd031bcf3776611e8973847a9c82f74873802 100644 (file)
--- 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 fc87b6a301363aa0574f1f072ad2400b40c465bd..3842594ad264300cc9e00fb5c640fc0c995edc03 100644 (file)
--- 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 2a95ffb45b2f6dfa512db5cf90d42ddbd6f6b3c4..645a4eb6f20fa1b1842ebd44612c4d0387546bde 100644 (file)
--- 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 46aa3fc030ac66242575ff0843d6880dcd1817f7..4a8cb5e043542d4a181a885a0d2d0d474e47817a 100644 (file)
--- 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 04cfd0be45fa90c3564499fe7b174b6dd60b5d75..a5f46decaa132493c12b5161cf4279baef1c99ef 100644 (file)
--- 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 d9eb94a34d5d285923c596c9b9ab145a3674ab3f..1a0d40d324aa22f7688e55746721a633d1933ee1 100644 (file)
--- 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 7dd248e64c7485b7af854849ec392798e266447b..35cd0a012e478ba2310e2508aab173d5b770d9d4 100644 (file)
--- 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 71868865f599866f907a73a8ed4fe18990f7a18b..ee805a8d5ae3a7ad6fff7226ca6a01ae2bd02e60 100644 (file)
--- 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 45c39726a746c98d27c7375ff7f0faff4a38ab6d..07be335885cdc9ce0413ec47e1e6328a2183f11a 100644 (file)
--- 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 783d5dc09b963276d1cfe7f92fe26616f4ee672a..74f6ab7b0997ef9335e7c709ef0069c3a70228a1 100644 (file)
--- 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 954984601e07ddf35c420f5af5f057b61304e545..5ff77841a0f91de184b365cca49acfd3a0bc0f44 100644 (file)
--- 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 b19dd781e782e7532de5d2cf32edf5514f50627c..c13d5b3cca75b8ff3b48ec95c599e2a7477387ef 100644 (file)
--- 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 3c570874dc3a5de1aa4241d66817dec637cf92c8..83b1053fada2af13ea470265429ce5be6fb90345 100644 (file)
--- 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 e10c1735230431c96931d4cdd2087623bc700b68..43889a6714e6caf268f0102661de4a8c7b342d1b 100644 (file)
--- 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 12ce5953664acad46ded3fbb2975600f3b11c600..80372b82b404ba691fb70e3ff6a69b6cf946314b 100644 (file)
--- 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 4ab4a998487726e9632bfdb7e26c5606083c955d..236e4aa225f971a4d3ff6992e0f33d9008eb2dda 100644 (file)
--- 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 7e6bdf67731e9a8bc5ff466cc73b5c0bdbbc013c..2c310e0c68b686e4023213c9a8b67f13de8994e0 100644 (file)
--- 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 a2cf2e42da5225d04ec3fd94668647abfa7ae2bc..16ac977ec069349667e2f50ac02503e3df9ff7ed 100644 (file)
--- 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 d72fc262e454813b5bdb61ddf4748139479607cd..7842759996350be36300ae1e7bd05a8fd79dd12e 100644 (file)
--- 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 c3c693a0873e67134e8867d58e0c791ab58fb0ba..f799550b315034adcbb2821aa8e175ae2aabdc09 100644 (file)
--- 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 ae2c61335064679b21b104f3e2836677a93a0317..3ab4adf176ef9f04c5f954e9f053ed819673733e 100644 (file)
--- 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 e9add522cd95a7c61b70a1d7d2402ff11831f158..5560b9a6466384e85941e4c4bfadfbe7ff0521c6 100644 (file)
--- 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 343d55c6487797cc63c94db290f541009d84619a..ee9b4294301f5935320043fd41bce5d65aa588dc 100644 (file)
--- 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 5f97e4d23cfb82e1b0638f571b3dabe9d9df779e..becae1d73f727546afc5bd344dfe7a286f89cd7d 100644 (file)
--- 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 4a73ee08c7fb96aa7e1035c413317984ae4bb499..0e23de14b1a829cac0b0b495762fd8ec832275f0 100644 (file)
--- 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 6ef4ef1bd1aff52882a8efeaa00f6b9ac6812acc..06830f76d99d8bf4d6d55ab5a1d30948ed62c068 100644 (file)
--- 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 e8d03144e638974c304070247651f665df9a24a4..c5a580bae69a7c7c8e20bebbee594ace404cc7c5 100644 (file)
--- 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 be262a95c42e879042e108da068294f4d8dfb34f..a66ac2e854a21226288e53dc9af8895bef40f87c 100644 (file)
--- 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 32f06ac8f8ce7c2b4f75c837c7ab7921192256ff..dc66788830c70dee921781e8444c163477238573 100644 (file)
--- 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 91b956fd4cf41f2301572266b02e4435bdb883de..ef2f5e759aae2de43f821a0e17190d5d043d4f21 100644 (file)
--- 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 d1e9fcf8d6fd404388ef70134848b1c1023a5045..13a658a1f17cf685a9dcf8e5327b91da32f75de8 100644 (file)
--- 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 5a07899db641b6d835661901c923c7f0d9d119c6..5dde11a6ff571a8bcf6ac93875b39eccf07938cc 100644 (file)
--- 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 c8958620d936621b299b30777fe248c0ab830072..136b3626c26961c912f326192cb4f96033fb0a02 100644 (file)
--- 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 d516d443e337a54eb962a8c3a6b489c123dcc71a..d7f635ca794c8a9b4900b792061c3655bb16d215 100644 (file)
--- 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 78bc6cb0644769ab374d8bd78755b7c8cb38666c..f1eb5a1f3c7c8ce0e6f5d622564ae49baca3120b 100644 (file)
--- 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 c02a696465285b2651f6114650973f131fb78c27..e885f074f5ed6a3e0a2a8dc2f878faef11acc78a 100644 (file)
--- 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 bc4359a5b924c60ba747e61f205aed26c9f98794..aa55bf338ce179cc27335b05b2a2ad1ea5b39ebd 100644 (file)
--- 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 cbe1afc23a0c4b76bd2cfa3169bae9338df9b3fd..7ac013e3fae0ec8fd2689412eb1fd37cc16a0cdf 100644 (file)
--- 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 fcf93151e1e7be66d34d4e5e714273185da7c3a7..ad5737ec5b625bfc36c03fae995669dc3d31b5ba 100644 (file)
--- 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 a3f78988117e3d0de22f41a7fec7246970cd0353..2e15e91ed3a92c065cd638298f12295c34476b3b 100644 (file)
--- 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 1105acf19036aa166cdc2e4cf1336b176aa93dde..9053f487100f78fb41a6d2028234e8b590593e9a 100644 (file)
--- 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 bbb92299c9f6c8682be0882878223938f6072beb..527c7bcd00af33d6407e9d577de79b73ebaf6d26 100644 (file)
--- 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 99d39a4d6f0e9cee4944ba78ecaa331630febff9..4a6c0d857eaa9ef7f24b242a875c41aa38d1ef3d 100644 (file)
--- 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 a8929fc4622e7c4c19bce4602429de2116ac72aa..7e6b0d587a228414c8cafefc0dd1508a2f8b66a6 100644 (file)
--- 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 d131195f2ae1b993ce0b8ac3db61119c50f6056e..d5fe08d8c1d5a775b432f9823e5e9b581277b89a 100644 (file)
--- 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 0280a9883402819ee14ab95392986e4c4ad5f79a..e23b664d6259f2cb99c0b31f291a689ae931d33c 100644 (file)
--- 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 4c598e9a700c02fc57db0da74620e23b03bf468d..a975db3c36e97ae8f915d26b7632b5d4b8e45723 100644 (file)
--- 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 756e7f4df0b62bff58df7a6197d0a04c280ac088..55fe94214bb71be0e541e388f2f9d3e20801b8ca 100644 (file)
--- 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 d42d8a1ec2e4a78aceb7e878fd6acc6fd708f3bd..bb59f5455f63a12443767f8a719a926b0dae0bd5 100644 (file)
--- 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 689a9ea74a367f55b8b6026f30c82658e083d7c8..fa7e098fbe36db5f1098623e8ce0b13dad5c41a3 100644 (file)
--- 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 c4805be931ccdb0c8f757d14335cca1992cdb669..43d70f1dbdc33afee4d23efe72647278a05ac2da 100644 (file)
--- 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 a67ca213ed2f395894b2c1440153d1f9b67c9193..07b550940156af5717a2ef1202d8721154447de3 100644 (file)
--- 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 d904afde6ee0be626ff6a70abe4f1ea3e606800f..0e8e6d84263cbcf17c81228f03ea111fe0d65ce6 100644 (file)
--- 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 a55b578b43db5686798ea1f5f989c55a97631f4d..ceffae8bb0cd702c9c4bf6feb7d98c7af87a22aa 100644 (file)
--- 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 854f36fb562ab34a5698ac7c6e34ab73cb78fbe1..8621d661dfff95712caced80d756407e1e3515d9 100644 (file)
--- 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 07136b12e5ef4a2b4335e6f52360672c79c3a966..5db963ebcf7d3cd8bb872c062e7779aae5736bab 100644 (file)
--- 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 5953121027a7400f3ad3fa73c80324fbf0482548..189a4e9e29ad27d29364b104c81c573d02f4c506 100644 (file)
--- 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 065f27a1baa2d2e7be960a61a6af4dd2e194b174..6e9a755bcf5d0bf60e4f542494a6a17c82315e44 100644 (file)
--- 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 946d382d3b58d8cca7acad47075a337207e5b90d..bf80e437fef8af660dde649bac0a3722c14adbf8 100644 (file)
--- 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 89c20e5b8d030c9f7ff0e311d455f69e33596c95..14c67200ed13f4dde214a8f3d7d16d26a0908cd5 100644 (file)
--- 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 74376af492c91d1c90f7e5148317fcb53a68948a..ea7139c3866b629d97e95674be359eabadfda05a 100644 (file)
--- 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 7ea286a878f96fd4cb1c6ca3f04cddc1530c8e5b..b62ea759dffcf27a1c52ada31720108103f39fa4 100644 (file)
--- 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 294d14eafc20f895a7cd10029b514ccb9f29f43f..79424b9c42cf0a20718ec98f0cefac9ce179655f 100644 (file)
--- 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 114b9781dbe1cd3748f41da79001f8f53717fac9..ecc942808254cefeaa80fdab169f3fe2342c03fe 100644 (file)
--- 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 23b8ddaaec2640200453d814762c80d5b826d868..e0e4142b81fd5ef36cd27ef97bae1f6834423bd5 100644 (file)
--- 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 8fe89ef132f527679db43c608493378fe8c153c2..36c864c1899f9ff64dcc01d44d85bfa565244752 100644 (file)
--- 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 4b0f38f740ffb4a65ad8ac6ad609ed2f3dedfbf0..0aff473dcc09f1e0a293e819c34f15b972a7b95d 100644 (file)
--- 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 c11233282000c0a828c948c50300f78f7ea840fc..6cea66281a380e369bb7fa3ff37247439dc64c8c 100644 (file)
--- 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 a947178529fbd3e83c3a91b32b0bbd7586f6198c..c679a6dbed6ccc491222b626c947ce848b40a7a9 100644 (file)
--- 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 b6ee698035d5e7202821c88a147e04ff708d2984..b78af22b718eaf328e54aa40022d6708c3c1f67b 100644 (file)
--- 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 f03b1a265f4c987f333a1a14eee9137c6705e922..45f8f98788e5bd3d4b2749240e88ae63fc3ff89a 100644 (file)
--- 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 7e3d00b614623ea5989483d435246b047b60d00f..24f258066df36226c458102e6b109972bebee4b7 100644 (file)
--- 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 d9b7d648389d64ef15092f5d914b84b807a81228..ad830e7b65d98b75a0afdd2d2f463b8a420394cc 100644 (file)
--- 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 d638f9d94b4c65fb902625556d90bf0c4d132fc1..6c40e906e431047cf7acb129ecd69e344707a97a 100644 (file)
--- 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 65dac91c72791bd75a03b1739ec555ca99d52506..98498b5e919bd7b0646c3552fd203048428b8564 100644 (file)
--- 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 e742938748f9e366258456786e29b7838c3cc8c5..013821c2fd770d33dd62dc468662d56175ef6b6d 100644 (file)
--- 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 46789e8083b93a4ba4736d11f671b675641c44a2..ddf39544ff59d2a5cc8b9051b08184ef7e30d6a6 100644 (file)
--- 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 ba8e83d1b393f3450efc4bf9318c1f8fcf4e6bb5..7a031ae64dd2de26cb1591ede5a73aba4bdc921f 100644 (file)
--- 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 e871b534e5ad1f6227b8f7a26f9af79f5655fd0d..2cd12bc296289b851ffca3591b6e551e6abcbf61 100644 (file)
--- 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 71bce93825fe22ada81452c9ae81797d88448c6c..2d529677a693208bdcf84bc033e1a1bdbb17614d 100644 (file)
--- 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 34f949dd2351ec1edb0734270645a91ae1c4482f..f6ca7438ee0a2dd9793cc42cf6e498aea0757d7e 100644 (file)
--- 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 c85c9a4e6e4c2e3ff0ccee7d60dd40e68550bbf6..f4d651e6bb6a3ff758fda7fbf279b5e95ec60863 100644 (file)
--- 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 874ae3218fd64c8d455109fa5f06d5eef645e022..7516c65f3eb49328b076da9b71abebcf72879796 100644 (file)
--- 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 62e78bd785ae7105085fc9ec1613400b33b7c3e4..5e3b6df8cfe5e2ff9173049eb79ef8ca8bb4da71 100644 (file)
--- 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 7227096717bf8b5dbc19df266a227dcdba2daf8d..e05e0b1625b75924fc0660bd922f2bf7352f33c9 100644 (file)
--- 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 4d1bb70ee5ced8ea9b21c1977d979ccec7ecb445..dd736b4ba9cd8b565d1e4a21fd57ed974d194bbc 100644 (file)
--- 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 f9086e71a81533fcbd2fe814d12213cb96cbb40e..ee5ecd4dc7db65c609381e9699f3d6349ed580f3 100644 (file)
--- 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 0e4df9552e35c21ac2dff8b42e62a06f21f54970..6ef19a9cfc31f9037f5282fd333fcd6bb1bd261d 100644 (file)
--- 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 3bb1998f24a8ff1d87775b20a583996bbe6e9700..c8f021f85007aa31fd2232c8d28bcc60a7cefde1 100644 (file)
--- 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 fd9607495ef21d5b0bf2a2eb8c511d456949eaa9..e693fb6795db5f476559aad30ebe0bbb7deee153 100644 (file)
--- 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 a9713ea320afce90ef4f0f5bd947768f7acee344..8d0bca567d0a85c6e50972c5c8dcb0e867a36d69 100644 (file)
--- 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 340ca120354d76ce59723a7458784ee22ec38614..6333d309bf07b536dbda70bd95e3b9311335a990 100644 (file)
--- 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 9c7bad8491e0b2a39dd3f12cfd0998d6aa562d82..f9bc343997bd3c6868becf8a303dac00f47cd6cc 100644 (file)
--- 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 35e667996db73d498327266a391f965d70eb3e01..958ae50553928b74edcf278e939aa323bbeccd23 100644 (file)
--- 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 11766cbc8c35522688de77a440299e9e82c9a352..723d9462079248e80e6c30e1491661dbc2af8172 100644 (file)
--- 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 6cda29dbb5535fa0ff7249f30768d17249c03363..7e42aabcbd8c0ddfe1a9dbb1812bcdab4d6470f6 100644 (file)
--- 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 1ec27efe207dcde40135b6f22901d6a6e7f09d00..c44045435bbe5fb6bb228d750f2cd71c0ce95704 100644 (file)
--- 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 721b3f087b84335df032129d8601e454d24f016b..ac9ba0af136fe664726ee61c174dce51f8eb6a59 100644 (file)
--- 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 5ed624c0df663de482ebf33a1ac03bdf7d1697b4..d1d3f71133a7026de973b996e16da875a722d7ef 100644 (file)
--- 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 8d2c462ea945b44b3917225fc96652d1a1ef07ec..8311835d6ad47d7cc340518389c563475fcd9822 100644 (file)
--- 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 3844725eb1f69c7723769030a62c01fa5a48f922..3c9adc0690c7dfba434f1fd2da61b0a29ae84c90 100644 (file)
--- 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 55138a3a0289aa1a27c8bb928594f7a5ba01d6b0..6e22bd94ff2d643b38814cc633bfe0d424d9f0b0 100644 (file)
--- 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 2a4f7900ad96bef70c0080d78b35c9d2aa89aefc..284b00d2dec95fe4df05c5dce51b45bc299ac9df 100644 (file)
--- 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 01c0bf9dbc9789b6bd95a7369b913a023d984641..882d05fa1b8a0c80401b9eab14a038f240f5a4b8 100644 (file)
--- 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 b44875538739accd9381d3c3e24e545447e018e0..e0a587431c5c4c64e9cbefa53a4c8e532eb04a4c 100644 (file)
--- 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 8549e39b1625c1b5104b7ac6b034ea8753a292b6..3975d0400e0bf47b86946c584c5e07c42e1a5614 100644 (file)
--- 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 f316c8fcd899ec19f2a3eb6df8297708c3d9eb94..73da86d3a488adc9be7aa342e5a68d4b7120d4b7 100644 (file)
--- 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 0732eac86b332700014726321efecfeec7e974af..88bf7d9e8461e0d49046ecac26843bb1f7f61a6c 100644 (file)
--- 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 1b26dc1d107f4199035fe27eebedf38865fcfdd3..d7dd97424e7d8a074fac06ac652e73a4148136bc 100644 (file)
--- 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 5cce320420c63535507d39a7d8abb4c9d878a2ad..299c78773499736d469492e109853bd012e8d84f 100644 (file)
--- 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 2df946417a3f5722f8b8c4eb7f0bc5b009313ffc..0a997a6b460920aaf382c5dfa46d585cb7f99574 100644 (file)
--- 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 846a30ea5cd95301cd4264f78a0f47d623c1472b..1366666c2d243816c973690157214c7b42530e80 100644 (file)
--- 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 4cbd68bff5781e0aeeee0705175a09e831b7545a..4f9d42f446d15d281c2755d592eed7e5d1732732 100644 (file)
--- 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 1b9fd0510d72f18afc82f30062b718c4ac915296..74c62ff66d918bd46fd20c1d648bdacc50e303cb 100644 (file)
--- 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 3455fe7c0fc34a1a0f9ef7ca7a204052488818e2..028895f8d12f0704615cb1d62096598b08a44ec7 100644 (file)
--- 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 7035fc05d516731166a3bbc2a9bbd21b15ba79bd..660c78abf401912526bbdb6c2788a205bd0f0ab5 100644 (file)
--- 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 e622b238d6d6a8f3ad2cc28fe2fc7eb5ce82593f..361a73d273df189b425b5a84e5531e98b6fb1c96 100644 (file)
--- 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 d0509001afbb5f92602bcdf0dcae462181cbdd63..0fa17e2864764a7d5f51acb72986787ff76fac33 100644 (file)
--- 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 e4974387074dbdbd054322b9cd2b5c4e63b31342..696d73bccef1fdbb8f3fde371a38eada23411f65 100644 (file)
--- 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 c7b8899f61df4d0ff27ee6517e01ce7ee599ba50..a31a05a923a1c9ec53e51e21fbdb057985c34a2b 100644 (file)
--- 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 d4b01ac573d3a5b4db5ba7e8a0b54b89fc4dbb23..bc5d69ae566b548fcca8954daa1c17afd2a8a549 100644 (file)
--- 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 dc6ef37f8ea56e5714161c854fac54abf31e6ea4..18911c79fe8d138b0ea3614889d5a4deb0b4b918 100644 (file)
--- 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 08e88caf84eeb704d150b8d7296d6ec73cac9b40..12b00b1b66f0aa5e263646599bdbcf5a3d3d0fa2 100644 (file)
--- 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 5e2dc57905fa05a12abb3df6edd698fab5fe29e8..b6911dd35921b4185d328b54040813fd8425cf5d 100644 (file)
--- 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 d9740c09fba23a677e84b8056c9916eb63c316d1..5f7d8fd23dbbbabb92d694688fc1e81f6c7ee3f1 100644 (file)
--- 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 51079fa944421a5884c7910416a5c65287181dac..b9751a0faaf2714460c8b5835a1c3a54ba0c43bb 100644 (file)
--- 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 a12c014b9b58684c23f984c067bbecab5124d1d5..a6b51ba306bb51d89a05114df57cd907f99e26b9 100644 (file)
--- 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"),
 };