# HG changeset patch
# User stefano
# Date 1213307413 0
# Node ID e943e140907732572741b74a745a4f3eeae31172
# Parent  b252326ba89568cce4c08730f214ea5f1fd7189d
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.

diff -r b252326ba895 -r e943e1409077 4xm.c
--- a/4xm.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/4xm.c	Thu Jun 12 21:50:13 2008 +0000
@@ -836,6 +836,6 @@
     decode_end,
     decode_frame,
     /*CODEC_CAP_DR1,*/
-    .long_name = "4X Movie",
+    .long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
 };
 
diff -r b252326ba895 -r e943e1409077 8bps.c
--- a/8bps.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/8bps.c	Thu Jun 12 21:50:13 2008 +0000
@@ -230,5 +230,5 @@
         decode_end,
         decode_frame,
         CODEC_CAP_DR1,
-        .long_name = "QuickTime 8BPS video",
+        .long_name = NULL_IF_CONFIG_SMALL("QuickTime 8BPS video"),
 };
diff -r b252326ba895 -r e943e1409077 8svx.c
--- a/8svx.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/8svx.c	Thu Jun 12 21:50:13 2008 +0000
@@ -96,7 +96,7 @@
   .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 @@
   .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 -r b252326ba895 -r e943e1409077 aasc.c
--- a/aasc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/aasc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -171,5 +171,5 @@
     aasc_decode_end,
     aasc_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Autodesk RLE",
+    .long_name = NULL_IF_CONFIG_SMALL("Autodesk RLE"),
 };
diff -r b252326ba895 -r e943e1409077 ac3dec.c
--- a/ac3dec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ac3dec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1198,5 +1198,5 @@
     .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 -r b252326ba895 -r e943e1409077 ac3enc.c
--- a/ac3enc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ac3enc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1364,5 +1364,5 @@
     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 -r b252326ba895 -r e943e1409077 adpcm.c
--- a/adpcm.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/adpcm.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1610,7 +1610,7 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 adxdec.c
--- a/adxdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/adxdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -165,6 +165,6 @@
     NULL,
     NULL,
     adx_decode_frame,
-    .long_name = "SEGA CRI ADX",
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
 };
 
diff -r b252326ba895 -r e943e1409077 adxenc.c
--- a/adxenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/adxenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -190,5 +190,5 @@
     adx_encode_frame,
     adx_encode_close,
     NULL,
-    .long_name = "SEGA CRI ADX",
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
 };
diff -r b252326ba895 -r e943e1409077 alac.c
--- a/alac.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/alac.c	Thu Jun 12 21:50:13 2008 +0000
@@ -620,5 +620,5 @@
     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 -r b252326ba895 -r e943e1409077 apedec.c
--- a/apedec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/apedec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -917,5 +917,5 @@
     NULL,
     ape_decode_close,
     ape_decode_frame,
-    .long_name = "Monkey's Audio",
+    .long_name = NULL_IF_CONFIG_SMALL("Monkey's Audio"),
 };
diff -r b252326ba895 -r e943e1409077 asv1.c
--- a/asv1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/asv1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -615,7 +615,7 @@
     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 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 atrac3.c
--- a/atrac3.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/atrac3.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1071,5 +1071,5 @@
     .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 -r b252326ba895 -r e943e1409077 avcodec.h
--- a/avcodec.h	Tue Jun 10 19:21:40 2008 +0000
+++ b/avcodec.h	Thu Jun 12 21:50:13 2008 +0000
@@ -2245,7 +2245,11 @@
     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 -r b252326ba895 -r e943e1409077 avs.c
--- a/avs.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/avs.c	Thu Jun 12 21:50:13 2008 +0000
@@ -158,5 +158,5 @@
     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 -r b252326ba895 -r e943e1409077 bethsoftvideo.c
--- a/bethsoftvideo.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/bethsoftvideo.c	Thu Jun 12 21:50:13 2008 +0000
@@ -136,5 +136,5 @@
     .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 -r b252326ba895 -r e943e1409077 bfi.c
--- a/bfi.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/bfi.c	Thu Jun 12 21:50:13 2008 +0000
@@ -178,5 +178,5 @@
     .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 -r b252326ba895 -r e943e1409077 bmp.c
--- a/bmp.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/bmp.c	Thu Jun 12 21:50:13 2008 +0000
@@ -258,5 +258,5 @@
     NULL,
     bmp_decode_end,
     bmp_decode_frame,
-    .long_name = "BMP image",
+    .long_name = NULL_IF_CONFIG_SMALL("BMP image"),
 };
diff -r b252326ba895 -r e943e1409077 bmpenc.c
--- a/bmpenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/bmpenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -95,5 +95,5 @@
     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 -r b252326ba895 -r e943e1409077 c93.c
--- a/c93.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/c93.c	Thu Jun 12 21:50:13 2008 +0000
@@ -250,5 +250,5 @@
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Interplay C93",
+    .long_name = NULL_IF_CONFIG_SMALL("Interplay C93"),
 };
diff -r b252326ba895 -r e943e1409077 cavsdec.c
--- a/cavsdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/cavsdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -699,5 +699,5 @@
     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 -r b252326ba895 -r e943e1409077 cinepak.c
--- a/cinepak.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/cinepak.c	Thu Jun 12 21:50:13 2008 +0000
@@ -463,5 +463,5 @@
     cinepak_decode_end,
     cinepak_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Cinepak",
+    .long_name = NULL_IF_CONFIG_SMALL("Cinepak"),
 };
diff -r b252326ba895 -r e943e1409077 cljr.c
--- a/cljr.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/cljr.c	Thu Jun 12 21:50:13 2008 +0000
@@ -140,7 +140,7 @@
     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 @@
     encode_init,
     encode_frame,
     //encode_end,
-    .long_name = "Cirrus Logic AccuPak",
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 
 #endif //CONFIG_ENCODERS
diff -r b252326ba895 -r e943e1409077 cook.c
--- a/cook.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/cook.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1195,5 +1195,5 @@
     .init = cook_decode_init,
     .close = cook_decode_close,
     .decode = cook_decode_frame,
-    .long_name = "COOK",
+    .long_name = NULL_IF_CONFIG_SMALL("COOK"),
 };
diff -r b252326ba895 -r e943e1409077 cscd.c
--- a/cscd.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/cscd.c	Thu Jun 12 21:50:13 2008 +0000
@@ -258,6 +258,6 @@
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "CamStudio",
+    .long_name = NULL_IF_CONFIG_SMALL("CamStudio"),
 };
 
diff -r b252326ba895 -r e943e1409077 cyuv.c
--- a/cyuv.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/cyuv.c	Thu Jun 12 21:50:13 2008 +0000
@@ -181,6 +181,6 @@
     cyuv_decode_frame,
     CODEC_CAP_DR1,
     NULL,
-    .long_name = "Creative YUV (CYUV)",
+    .long_name = NULL_IF_CONFIG_SMALL("Creative YUV (CYUV)"),
 };
 
diff -r b252326ba895 -r e943e1409077 dca.c
--- a/dca.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dca.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1264,5 +1264,5 @@
     .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 -r b252326ba895 -r e943e1409077 dnxhddec.c
--- a/dnxhddec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dnxhddec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -342,5 +342,5 @@
     dnxhd_decode_close,
     dnxhd_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "VC3/DNxHD",
+    .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"),
 };
diff -r b252326ba895 -r e943e1409077 dnxhdenc.c
--- a/dnxhdenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dnxhdenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -857,5 +857,5 @@
     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 -r b252326ba895 -r e943e1409077 dpcm.c
--- a/dpcm.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dpcm.c	Thu Jun 12 21:50:13 2008 +0000
@@ -304,7 +304,7 @@
     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 -r b252326ba895 -r e943e1409077 dsicinav.c
--- a/dsicinav.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dsicinav.c	Thu Jun 12 21:50:13 2008 +0000
@@ -348,7 +348,7 @@
     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 @@
     NULL,
     NULL,
     cinaudio_decode_frame,
-    .long_name = "Delphine Software International CIN audio",
+    .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"),
 };
diff -r b252326ba895 -r e943e1409077 dv.c
--- a/dv.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dv.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1236,7 +1236,7 @@
     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 @@
     dvvideo_decode_frame,
     CODEC_CAP_DR1,
     NULL,
-    .long_name = "DV (Digital Video)",
+    .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
 };
 #endif
diff -r b252326ba895 -r e943e1409077 dvbsub.c
--- a/dvbsub.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dvbsub.c	Thu Jun 12 21:50:13 2008 +0000
@@ -408,5 +408,5 @@
     sizeof(DVBSubtitleContext),
     NULL,
     dvbsub_encode,
-    .long_name = "DVB subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
 };
diff -r b252326ba895 -r e943e1409077 dvbsubdec.c
--- a/dvbsubdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dvbsubdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1430,5 +1430,5 @@
     NULL,
     dvbsub_close_decoder,
     dvbsub_decode,
-    .long_name = "DVB subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"),
 };
diff -r b252326ba895 -r e943e1409077 dvdsubdec.c
--- a/dvdsubdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dvdsubdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -506,5 +506,5 @@
     NULL,
     NULL,
     dvdsub_decode,
-    .long_name = "DVD subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 };
diff -r b252326ba895 -r e943e1409077 dvdsubenc.c
--- a/dvdsubenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dvdsubenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -222,5 +222,5 @@
     0,
     NULL,
     dvdsub_encode,
-    .long_name = "DVD subtitles",
+    .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
 };
diff -r b252326ba895 -r e943e1409077 dxa.c
--- a/dxa.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/dxa.c	Thu Jun 12 21:50:13 2008 +0000
@@ -327,6 +327,6 @@
     NULL,
     decode_end,
     decode_frame,
-    .long_name = "Feeble Files/ScummVM DXA",
+    .long_name = NULL_IF_CONFIG_SMALL("Feeble Files/ScummVM DXA"),
 };
 
diff -r b252326ba895 -r e943e1409077 escape124.c
--- a/escape124.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/escape124.c	Thu Jun 12 21:50:13 2008 +0000
@@ -380,6 +380,6 @@
     escape124_decode_close,
     escape124_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Escape 124",
+    .long_name = NULL_IF_CONFIG_SMALL("Escape 124"),
 };
 
diff -r b252326ba895 -r e943e1409077 ffv1.c
--- a/ffv1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ffv1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1026,7 +1026,7 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 flac.c
--- a/flac.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/flac.c	Thu Jun 12 21:50:13 2008 +0000
@@ -774,5 +774,5 @@
     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 -r b252326ba895 -r e943e1409077 flacenc.c
--- a/flacenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/flacenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1492,5 +1492,5 @@
     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 -r b252326ba895 -r e943e1409077 flashsv.c
--- a/flashsv.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/flashsv.c	Thu Jun 12 21:50:13 2008 +0000
@@ -255,5 +255,5 @@
     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 -r b252326ba895 -r e943e1409077 flashsvenc.c
--- a/flashsvenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/flashsvenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -293,6 +293,6 @@
     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 -r b252326ba895 -r e943e1409077 flicvideo.c
--- a/flicvideo.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/flicvideo.c	Thu Jun 12 21:50:13 2008 +0000
@@ -750,5 +750,5 @@
     NULL,
     NULL,
     NULL,
-    .long_name = "Autodesk Animator Flic video",
+    .long_name = NULL_IF_CONFIG_SMALL("Autodesk Animator Flic video"),
 };
diff -r b252326ba895 -r e943e1409077 fraps.c
--- a/fraps.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/fraps.c	Thu Jun 12 21:50:13 2008 +0000
@@ -365,5 +365,5 @@
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Fraps",
+    .long_name = NULL_IF_CONFIG_SMALL("Fraps"),
 };
diff -r b252326ba895 -r e943e1409077 g726.c
--- a/g726.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/g726.c	Thu Jun 12 21:50:13 2008 +0000
@@ -413,7 +413,7 @@
     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 @@
     NULL,
     g726_close,
     g726_decode_frame,
-    .long_name = "G.726 ADPCM",
+    .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 };
diff -r b252326ba895 -r e943e1409077 gif.c
--- a/gif.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/gif.c	Thu Jun 12 21:50:13 2008 +0000
@@ -341,5 +341,5 @@
     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 -r b252326ba895 -r e943e1409077 gifdec.c
--- a/gifdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/gifdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -333,5 +333,5 @@
     NULL,
     gif_decode_close,
     gif_decode_frame,
-    .long_name = "GIF (Graphics Interchange Format)",
+    .long_name = NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"),
 };
diff -r b252326ba895 -r e943e1409077 h261dec.c
--- a/h261dec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/h261dec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -647,5 +647,5 @@
     h261_decode_end,
     h261_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "H.261",
+    .long_name = NULL_IF_CONFIG_SMALL("H.261"),
 };
diff -r b252326ba895 -r e943e1409077 h261enc.c
--- a/h261enc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/h261enc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -330,6 +330,6 @@
     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 -r b252326ba895 -r e943e1409077 h263dec.c
--- a/h263dec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/h263dec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -723,7 +723,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 h264.c
--- a/h264.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/h264.c	Thu Jun 12 21:50:13 2008 +0000
@@ -8100,7 +8100,7 @@
     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 -r b252326ba895 -r e943e1409077 huffyuv.c
--- a/huffyuv.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/huffyuv.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1445,7 +1445,7 @@
     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 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 idcinvideo.c
--- a/idcinvideo.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/idcinvideo.c	Thu Jun 12 21:50:13 2008 +0000
@@ -262,6 +262,6 @@
     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 -r b252326ba895 -r e943e1409077 imc.c
--- a/imc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/imc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -813,5 +813,5 @@
     .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 -r b252326ba895 -r e943e1409077 indeo2.c
--- a/indeo2.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/indeo2.c	Thu Jun 12 21:50:13 2008 +0000
@@ -219,5 +219,5 @@
     NULL,
     ir2_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Intel Indeo 2",
+    .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),
 };
diff -r b252326ba895 -r e943e1409077 indeo3.c
--- a/indeo3.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/indeo3.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1135,5 +1135,5 @@
     indeo3_decode_frame,
     0,
     NULL,
-    .long_name = "Intel Indeo 3",
+    .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 3"),
 };
diff -r b252326ba895 -r e943e1409077 interplayvideo.c
--- a/interplayvideo.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/interplayvideo.c	Thu Jun 12 21:50:13 2008 +0000
@@ -942,5 +942,5 @@
     ipvideo_decode_end,
     ipvideo_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Interplay MVE Video",
+    .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE Video"),
 };
diff -r b252326ba895 -r e943e1409077 jpeglsdec.c
--- a/jpeglsdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/jpeglsdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -372,5 +372,5 @@
     ff_mjpeg_decode_end,
     ff_mjpeg_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "JPEG-LS",
+    .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"),
 };
diff -r b252326ba895 -r e943e1409077 jpeglsenc.c
--- a/jpeglsenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/jpeglsenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -390,5 +390,5 @@
     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 -r b252326ba895 -r e943e1409077 kmvc.c
--- a/kmvc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/kmvc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -411,5 +411,5 @@
     NULL,
     decode_end,
     decode_frame,
-    .long_name = "Karl Morton's video codec",
+    .long_name = NULL_IF_CONFIG_SMALL("Karl Morton's video codec"),
 };
diff -r b252326ba895 -r e943e1409077 lcldec.c
--- a/lcldec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/lcldec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -697,7 +697,7 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 lclenc.c
--- a/lclenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/lclenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -228,5 +228,5 @@
     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 -r b252326ba895 -r e943e1409077 liba52.c
--- a/liba52.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/liba52.c	Thu Jun 12 21:50:13 2008 +0000
@@ -222,5 +222,5 @@
     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 -r b252326ba895 -r e943e1409077 libamr.c
--- a/libamr.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libamr.c	Thu Jun 12 21:50:13 2008 +0000
@@ -503,7 +503,7 @@
     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 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 libdiracdec.c
--- a/libdiracdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libdiracdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -205,5 +205,5 @@
     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 -r b252326ba895 -r e943e1409077 libdiracenc.c
--- a/libdiracenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libdiracenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -370,5 +370,5 @@
     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 -r b252326ba895 -r e943e1409077 libfaac.c
--- a/libfaac.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libfaac.c	Thu Jun 12 21:50:13 2008 +0000
@@ -151,5 +151,5 @@
     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 -r b252326ba895 -r e943e1409077 libfaad.c
--- a/libfaad.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libfaad.c	Thu Jun 12 21:50:13 2008 +0000
@@ -325,7 +325,7 @@
     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 -r b252326ba895 -r e943e1409077 libgsm.c
--- a/libgsm.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libgsm.c	Thu Jun 12 21:50:13 2008 +0000
@@ -117,7 +117,7 @@
     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 @@
     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 @@
     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 @@
     NULL,
     libgsm_close,
     libgsm_decode_frame,
-    .long_name = "libgsm GSM Microsoft variant",
+    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
 };
diff -r b252326ba895 -r e943e1409077 libmp3lame.c
--- a/libmp3lame.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libmp3lame.c	Thu Jun 12 21:50:13 2008 +0000
@@ -218,5 +218,5 @@
     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 -r b252326ba895 -r e943e1409077 libschroedingerdec.c
--- a/libschroedingerdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libschroedingerdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -305,5 +305,5 @@
     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 -r b252326ba895 -r e943e1409077 libschroedingerenc.c
--- a/libschroedingerenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libschroedingerenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -384,5 +384,5 @@
     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 -r b252326ba895 -r e943e1409077 libtheoraenc.c
--- a/libtheoraenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libtheoraenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -277,5 +277,5 @@
     .close = encode_close,
     .encode = encode_frame,
     .pix_fmts = supported_pixel_formats,
-    .long_name = "libtheora Theora",
+    .long_name = NULL_IF_CONFIG_SMALL("libtheora Theora"),
 };
diff -r b252326ba895 -r e943e1409077 libvorbis.c
--- a/libvorbis.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libvorbis.c	Thu Jun 12 21:50:13 2008 +0000
@@ -217,5 +217,5 @@
     oggvorbis_encode_frame,
     oggvorbis_encode_close,
     .capabilities= CODEC_CAP_DELAY,
-    .long_name= "libvorbis Vorbis",
+    .long_name= NULL_IF_CONFIG_SMALL("libvorbis Vorbis"),
 } ;
diff -r b252326ba895 -r e943e1409077 libx264.c
--- a/libx264.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libx264.c	Thu Jun 12 21:50:13 2008 +0000
@@ -301,5 +301,5 @@
     .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 -r b252326ba895 -r e943e1409077 libxvidff.c
--- a/libxvidff.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/libxvidff.c	Thu Jun 12 21:50:13 2008 +0000
@@ -778,5 +778,5 @@
     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 -r b252326ba895 -r e943e1409077 ljpegenc.c
--- a/ljpegenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ljpegenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -194,5 +194,5 @@
     MPV_encode_init,
     encode_picture_lossless,
     MPV_encode_end,
-    .long_name = "Lossless JPEG",
+    .long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"),
 };
diff -r b252326ba895 -r e943e1409077 loco.c
--- a/loco.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/loco.c	Thu Jun 12 21:50:13 2008 +0000
@@ -282,5 +282,5 @@
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "LOCO",
+    .long_name = NULL_IF_CONFIG_SMALL("LOCO"),
 };
diff -r b252326ba895 -r e943e1409077 mace.c
--- a/mace.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mace.c	Thu Jun 12 21:50:13 2008 +0000
@@ -437,7 +437,7 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 mdec.c
--- a/mdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -267,6 +267,6 @@
     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 -r b252326ba895 -r e943e1409077 mimic.c
--- a/mimic.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mimic.c	Thu Jun 12 21:50:13 2008 +0000
@@ -386,5 +386,5 @@
     mimic_decode_end,
     mimic_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Mimic",
+    .long_name = NULL_IF_CONFIG_SMALL("Mimic"),
 };
diff -r b252326ba895 -r e943e1409077 mjpegbdec.c
--- a/mjpegbdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mjpegbdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -146,5 +146,5 @@
     mjpegb_decode_frame,
     CODEC_CAP_DR1,
     NULL,
-    .long_name = "Apple MJPEG-B",
+    .long_name = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"),
 };
diff -r b252326ba895 -r e943e1409077 mjpegdec.c
--- a/mjpegdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mjpegdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1364,7 +1364,7 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 mjpegenc.c
--- a/mjpegenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mjpegenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -455,5 +455,5 @@
     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 -r b252326ba895 -r e943e1409077 mmvideo.c
--- a/mmvideo.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mmvideo.c	Thu Jun 12 21:50:13 2008 +0000
@@ -202,5 +202,5 @@
     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 -r b252326ba895 -r e943e1409077 mpc7.c
--- a/mpc7.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mpc7.c	Thu Jun 12 21:50:13 2008 +0000
@@ -273,5 +273,5 @@
     NULL,
     mpc7_decode_frame,
     .flush = mpc7_decode_flush,
-    .long_name = "Musepack SV7",
+    .long_name = NULL_IF_CONFIG_SMALL("Musepack SV7"),
 };
diff -r b252326ba895 -r e943e1409077 mpc8.c
--- a/mpc8.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mpc8.c	Thu Jun 12 21:50:13 2008 +0000
@@ -361,5 +361,5 @@
     NULL,
     NULL,
     mpc8_decode_frame,
-    .long_name = "Musepack SV8",
+    .long_name = NULL_IF_CONFIG_SMALL("Musepack SV8"),
 };
diff -r b252326ba895 -r e943e1409077 mpeg12.c
--- a/mpeg12.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mpeg12.c	Thu Jun 12 21:50:13 2008 +0000
@@ -2445,7 +2445,7 @@
     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 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 mpeg12enc.c
--- a/mpeg12enc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mpeg12enc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -938,7 +938,7 @@
     .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 @@
     .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 -r b252326ba895 -r e943e1409077 mpegaudiodec.c
--- a/mpegaudiodec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mpegaudiodec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -2640,7 +2640,7 @@
     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 @@
     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 @@
     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 @@
     decode_close_mp3on4,
     decode_frame_mp3on4,
     .flush= flush,
-    .long_name= "MP3onMP4",
+    .long_name= NULL_IF_CONFIG_SMALL("MP3onMP4"),
 };
 #endif
diff -r b252326ba895 -r e943e1409077 mpegaudioenc.c
--- a/mpegaudioenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mpegaudioenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -796,7 +796,7 @@
     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 -r b252326ba895 -r e943e1409077 mpegvideo_enc.c
--- a/mpegvideo_enc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/mpegvideo_enc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -3749,7 +3749,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 msrle.c
--- a/msrle.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/msrle.c	Thu Jun 12 21:50:13 2008 +0000
@@ -304,5 +304,5 @@
     msrle_decode_end,
     msrle_decode_frame,
     CODEC_CAP_DR1,
-    .long_name= "Microsoft RLE",
+    .long_name= NULL_IF_CONFIG_SMALL("Microsoft RLE"),
 };
diff -r b252326ba895 -r e943e1409077 msvideo1.c
--- a/msvideo1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/msvideo1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -339,5 +339,5 @@
     msvideo1_decode_end,
     msvideo1_decode_frame,
     CODEC_CAP_DR1,
-    .long_name= "Microsoft Video 1",
+    .long_name= NULL_IF_CONFIG_SMALL("Microsoft Video 1"),
 };
diff -r b252326ba895 -r e943e1409077 nellymoserdec.c
--- a/nellymoserdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/nellymoserdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -206,6 +206,6 @@
     NULL,
     decode_end,
     decode_tag,
-    .long_name = "Nellymoser Asao",
+    .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
 };
 
diff -r b252326ba895 -r e943e1409077 nuv.c
--- a/nuv.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/nuv.c	Thu Jun 12 21:50:13 2008 +0000
@@ -270,6 +270,6 @@
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "NuppelVideo",
+    .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo"),
 };
 
diff -r b252326ba895 -r e943e1409077 pcm.c
--- a/pcm.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/pcm.c	Thu Jun 12 21:50:13 2008 +0000
@@ -530,7 +530,7 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 pcx.c
--- a/pcx.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/pcx.c	Thu Jun 12 21:50:13 2008 +0000
@@ -244,5 +244,5 @@
     pcx_decode_frame,
     0,
     NULL,
-    .long_name = "PC Paintbrush PCX image",
+    .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
 };
diff -r b252326ba895 -r e943e1409077 pngdec.c
--- a/pngdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/pngdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -618,5 +618,5 @@
     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 -r b252326ba895 -r e943e1409077 pngenc.c
--- a/pngenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/pngenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -445,5 +445,5 @@
     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 -r b252326ba895 -r e943e1409077 pnmenc.c
--- a/pnmenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/pnmenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -365,7 +365,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 ptx.c
--- a/ptx.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ptx.c	Thu Jun 12 21:50:13 2008 +0000
@@ -114,5 +114,5 @@
     ptx_decode_frame,
     0,
     NULL,
-    .long_name = "V.Flash PTX image",
+    .long_name = NULL_IF_CONFIG_SMALL("V.Flash PTX image"),
 };
diff -r b252326ba895 -r e943e1409077 qdm2.c
--- a/qdm2.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/qdm2.c	Thu Jun 12 21:50:13 2008 +0000
@@ -2038,5 +2038,5 @@
     .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 -r b252326ba895 -r e943e1409077 qdrw.c
--- a/qdrw.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/qdrw.c	Thu Jun 12 21:50:13 2008 +0000
@@ -151,5 +151,5 @@
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Apple QuickDraw",
+    .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"),
 };
diff -r b252326ba895 -r e943e1409077 qpeg.c
--- a/qpeg.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/qpeg.c	Thu Jun 12 21:50:13 2008 +0000
@@ -316,5 +316,5 @@
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Q-team QPEG",
+    .long_name = NULL_IF_CONFIG_SMALL("Q-team QPEG"),
 };
diff -r b252326ba895 -r e943e1409077 qtrle.c
--- a/qtrle.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/qtrle.c	Thu Jun 12 21:50:13 2008 +0000
@@ -620,6 +620,6 @@
     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 -r b252326ba895 -r e943e1409077 qtrleenc.c
--- a/qtrleenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/qtrleenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -323,5 +323,5 @@
     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 -r b252326ba895 -r e943e1409077 ra144.c
--- a/ra144.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ra144.c	Thu Jun 12 21:50:13 2008 +0000
@@ -396,5 +396,5 @@
     NULL,
     NULL,
     ra144_decode_frame,
-    .long_name = "RealAudio 1.0 (14.4K)",
+    .long_name = NULL_IF_CONFIG_SMALL("RealAudio 1.0 (14.4K)"),
 };
diff -r b252326ba895 -r e943e1409077 ra288.c
--- a/ra288.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ra288.c	Thu Jun 12 21:50:13 2008 +0000
@@ -255,5 +255,5 @@
     NULL,
     NULL,
     ra288_decode_frame,
-    .long_name = "RealAudio 2.0 (28.8K)",
+    .long_name = NULL_IF_CONFIG_SMALL("RealAudio 2.0 (28.8K)"),
 };
diff -r b252326ba895 -r e943e1409077 rawdec.c
--- a/rawdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/rawdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -162,5 +162,5 @@
     NULL,
     raw_close_decoder,
     raw_decode,
-    .long_name = "raw video",
+    .long_name = NULL_IF_CONFIG_SMALL("raw video"),
 };
diff -r b252326ba895 -r e943e1409077 rawenc.c
--- a/rawenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/rawenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -51,5 +51,5 @@
     sizeof(AVFrame),
     raw_init_encoder,
     raw_encode,
-    .long_name = "raw video",
+    .long_name = NULL_IF_CONFIG_SMALL("raw video"),
 };
diff -r b252326ba895 -r e943e1409077 rl2.c
--- a/rl2.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/rl2.c	Thu Jun 12 21:50:13 2008 +0000
@@ -236,6 +236,6 @@
     rl2_decode_end,
     rl2_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "RL2 video",
+    .long_name = NULL_IF_CONFIG_SMALL("RL2 video"),
 };
 
diff -r b252326ba895 -r e943e1409077 roqaudioenc.c
--- a/roqaudioenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/roqaudioenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -174,5 +174,5 @@
     roq_dpcm_encode_frame,
     roq_dpcm_encode_close,
     NULL,
-    .long_name = "id RoQ DPCM",
+    .long_name = NULL_IF_CONFIG_SMALL("id RoQ DPCM"),
 };
diff -r b252326ba895 -r e943e1409077 roqvideodec.c
--- a/roqvideodec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/roqvideodec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -219,5 +219,5 @@
     roq_decode_end,
     roq_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Id RoQ video",
+    .long_name = NULL_IF_CONFIG_SMALL("Id RoQ video"),
 };
diff -r b252326ba895 -r e943e1409077 roqvideoenc.c
--- a/roqvideoenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/roqvideoenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1066,5 +1066,5 @@
     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 -r b252326ba895 -r e943e1409077 rpza.c
--- a/rpza.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/rpza.c	Thu Jun 12 21:50:13 2008 +0000
@@ -283,5 +283,5 @@
     rpza_decode_end,
     rpza_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "QuickTime video (RPZA)",
+    .long_name = NULL_IF_CONFIG_SMALL("QuickTime video (RPZA)"),
 };
diff -r b252326ba895 -r e943e1409077 rv10.c
--- a/rv10.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/rv10.c	Thu Jun 12 21:50:13 2008 +0000
@@ -785,7 +785,7 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 rv30.c
--- a/rv30.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/rv30.c	Thu Jun 12 21:50:13 2008 +0000
@@ -144,5 +144,5 @@
     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 -r b252326ba895 -r e943e1409077 rv40.c
--- a/rv40.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/rv40.c	Thu Jun 12 21:50:13 2008 +0000
@@ -276,5 +276,5 @@
     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 -r b252326ba895 -r e943e1409077 sgidec.c
--- a/sgidec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/sgidec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -263,6 +263,6 @@
     NULL,
     sgi_end,
     decode_frame,
-    .long_name = "SGI image",
+    .long_name = NULL_IF_CONFIG_SMALL("SGI image"),
 };
 
diff -r b252326ba895 -r e943e1409077 sgienc.c
--- a/sgienc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/sgienc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -152,6 +152,6 @@
     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 -r b252326ba895 -r e943e1409077 shorten.c
--- a/shorten.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/shorten.c	Thu Jun 12 21:50:13 2008 +0000
@@ -532,5 +532,5 @@
     shorten_decode_close,
     shorten_decode_frame,
     .flush= shorten_flush,
-    .long_name= "Shorten",
+    .long_name= NULL_IF_CONFIG_SMALL("Shorten"),
 };
diff -r b252326ba895 -r e943e1409077 smacker.c
--- a/smacker.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/smacker.c	Thu Jun 12 21:50:13 2008 +0000
@@ -698,7 +698,7 @@
     NULL,
     decode_end,
     decode_frame,
-    .long_name = "Smacker video",
+    .long_name = NULL_IF_CONFIG_SMALL("Smacker video"),
 };
 
 AVCodec smackaud_decoder = {
@@ -710,6 +710,6 @@
     NULL,
     NULL,
     smka_decode_frame,
-    .long_name = "Smacker audio",
+    .long_name = NULL_IF_CONFIG_SMALL("Smacker audio"),
 };
 
diff -r b252326ba895 -r e943e1409077 smc.c
--- a/smc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/smc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -484,5 +484,5 @@
     smc_decode_end,
     smc_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "QuickTime Graphics (SMC)",
+    .long_name = NULL_IF_CONFIG_SMALL("QuickTime Graphics (SMC)"),
 };
diff -r b252326ba895 -r e943e1409077 snow.c
--- a/snow.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/snow.c	Thu Jun 12 21:50:13 2008 +0000
@@ -4661,7 +4661,7 @@
     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 @@
     encode_init,
     encode_frame,
     encode_end,
-    .long_name = "Snow",
+    .long_name = NULL_IF_CONFIG_SMALL("Snow"),
 };
 #endif
 
diff -r b252326ba895 -r e943e1409077 sonic.c
--- a/sonic.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/sonic.c	Thu Jun 12 21:50:13 2008 +0000
@@ -946,7 +946,7 @@
     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 @@
     sonic_encode_frame,
     sonic_encode_close,
     NULL,
-    .long_name = "Sonic lossless",
+    .long_name = NULL_IF_CONFIG_SMALL("Sonic lossless"),
 };
 #endif
 
@@ -972,6 +972,6 @@
     NULL,
     sonic_decode_close,
     sonic_decode_frame,
-    .long_name = "Sonic",
+    .long_name = NULL_IF_CONFIG_SMALL("Sonic"),
 };
 #endif
diff -r b252326ba895 -r e943e1409077 sp5xdec.c
--- a/sp5xdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/sp5xdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -199,7 +199,7 @@
     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 @@
     NULL,
     ff_mjpeg_decode_end,
     sp5x_decode_frame,
-    .long_name = "AMV Video",
+    .long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
 };
diff -r b252326ba895 -r e943e1409077 sunrast.c
--- a/sunrast.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/sunrast.c	Thu Jun 12 21:50:13 2008 +0000
@@ -192,5 +192,5 @@
     sunrast_decode_frame,
     0,
     NULL,
-    .long_name = "Sun Rasterfile image",
+    .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
 };
diff -r b252326ba895 -r e943e1409077 svq1dec.c
--- a/svq1dec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/svq1dec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -826,5 +826,5 @@
     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 -r b252326ba895 -r e943e1409077 svq1enc.c
--- a/svq1enc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/svq1enc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -585,5 +585,5 @@
     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 -r b252326ba895 -r e943e1409077 svq3.c
--- a/svq3.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/svq3.c	Thu Jun 12 21:50:13 2008 +0000
@@ -983,5 +983,5 @@
     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 -r b252326ba895 -r e943e1409077 targa.c
--- a/targa.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/targa.c	Thu Jun 12 21:50:13 2008 +0000
@@ -250,5 +250,5 @@
     decode_frame,
     0,
     NULL,
-    .long_name = "Truevision Targa image",
+    .long_name = NULL_IF_CONFIG_SMALL("Truevision Targa image"),
 };
diff -r b252326ba895 -r e943e1409077 targaenc.c
--- a/targaenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/targaenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -156,5 +156,5 @@
     .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 -r b252326ba895 -r e943e1409077 tiertexseqv.c
--- a/tiertexseqv.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/tiertexseqv.c	Thu Jun 12 21:50:13 2008 +0000
@@ -227,5 +227,5 @@
     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 -r b252326ba895 -r e943e1409077 tiff.c
--- a/tiff.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/tiff.c	Thu Jun 12 21:50:13 2008 +0000
@@ -496,5 +496,5 @@
     decode_frame,
     0,
     NULL,
-    .long_name = "TIFF image",
+    .long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
 };
diff -r b252326ba895 -r e943e1409077 tiffenc.c
--- a/tiffenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/tiffenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -458,5 +458,5 @@
                               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 -r b252326ba895 -r e943e1409077 truemotion1.c
--- a/truemotion1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/truemotion1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -899,5 +899,5 @@
     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 -r b252326ba895 -r e943e1409077 truemotion2.c
--- a/truemotion2.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/truemotion2.c	Thu Jun 12 21:50:13 2008 +0000
@@ -887,5 +887,5 @@
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Duck TrueMotion 2.0",
+    .long_name = NULL_IF_CONFIG_SMALL("Duck TrueMotion 2.0"),
 };
diff -r b252326ba895 -r e943e1409077 truespeech.c
--- a/truespeech.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/truespeech.c	Thu Jun 12 21:50:13 2008 +0000
@@ -380,5 +380,5 @@
     NULL,
     NULL,
     truespeech_decode_frame,
-    .long_name = "DSP Group TrueSpeech",
+    .long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"),
 };
diff -r b252326ba895 -r e943e1409077 tscc.c
--- a/tscc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/tscc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -341,6 +341,6 @@
         decode_end,
         decode_frame,
         CODEC_CAP_DR1,
-        .long_name = "TechSmith Screen Capture Codec",
+        .long_name = NULL_IF_CONFIG_SMALL("TechSmith Screen Capture Codec"),
 };
 
diff -r b252326ba895 -r e943e1409077 tta.c
--- a/tta.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/tta.c	Thu Jun 12 21:50:13 2008 +0000
@@ -443,5 +443,5 @@
     NULL,
     tta_decode_close,
     tta_decode_frame,
-    .long_name = "True Audio",
+    .long_name = NULL_IF_CONFIG_SMALL("True Audio"),
 };
diff -r b252326ba895 -r e943e1409077 txd.c
--- a/txd.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/txd.c	Thu Jun 12 21:50:13 2008 +0000
@@ -163,5 +163,5 @@
     txd_decode_frame,
     0,
     NULL,
-    .long_name = "Renderware TXD (TeXture Dictionary) image",
+    .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"),
 };
diff -r b252326ba895 -r e943e1409077 ulti.c
--- a/ulti.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ulti.c	Thu Jun 12 21:50:13 2008 +0000
@@ -411,6 +411,6 @@
     ulti_decode_frame,
     CODEC_CAP_DR1,
     NULL,
-    .long_name = "IBM UltiMotion",
+    .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"),
 };
 
diff -r b252326ba895 -r e943e1409077 vb.c
--- a/vb.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vb.c	Thu Jun 12 21:50:13 2008 +0000
@@ -278,6 +278,6 @@
     NULL,
     decode_end,
     decode_frame,
-    .long_name = "Beam Software VB",
+    .long_name = NULL_IF_CONFIG_SMALL("Beam Software VB"),
 };
 
diff -r b252326ba895 -r e943e1409077 vc1.c
--- a/vc1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vc1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -4137,7 +4137,7 @@
     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 @@
     vc1_decode_frame,
     CODEC_CAP_DELAY,
     NULL,
-    .long_name = "Windows Media Video 9",
+    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
 };
diff -r b252326ba895 -r e943e1409077 vcr1.c
--- a/vcr1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vcr1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -172,7 +172,7 @@
     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 @@
     encode_init,
     encode_frame,
     //encode_end,
-    .long_name = "ATI VCR1",
+    .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
 
 #endif //CONFIG_ENCODERS
diff -r b252326ba895 -r e943e1409077 vmdav.c
--- a/vmdav.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vmdav.c	Thu Jun 12 21:50:13 2008 +0000
@@ -561,7 +561,7 @@
     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 @@
     NULL,
     NULL,
     vmdaudio_decode_frame,
-    .long_name = "Sierra VMD audio",
+    .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
 };
diff -r b252326ba895 -r e943e1409077 vmnc.c
--- a/vmnc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vmnc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -518,6 +518,6 @@
     NULL,
     decode_end,
     decode_frame,
-    .long_name = "VMware Screen Codec / VMware Video",
+    .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"),
 };
 
diff -r b252326ba895 -r e943e1409077 vorbis_dec.c
--- a/vorbis_dec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vorbis_dec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1634,6 +1634,6 @@
     NULL,
     vorbis_decode_close,
     vorbis_decode_frame,
-    .long_name = "Vorbis",
+    .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
 };
 
diff -r b252326ba895 -r e943e1409077 vorbis_enc.c
--- a/vorbis_enc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vorbis_enc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -1084,5 +1084,5 @@
     vorbis_encode_frame,
     vorbis_encode_close,
     .capabilities= CODEC_CAP_DELAY,
-    .long_name = "Vorbis",
+    .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
 };
diff -r b252326ba895 -r e943e1409077 vp3.c
--- a/vp3.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vp3.c	Thu Jun 12 21:50:13 2008 +0000
@@ -2620,7 +2620,7 @@
     vp3_decode_frame,
     0,
     NULL,
-    .long_name = "Theora",
+    .long_name = NULL_IF_CONFIG_SMALL("Theora"),
 };
 #endif
 
@@ -2635,5 +2635,5 @@
     vp3_decode_frame,
     0,
     NULL,
-    .long_name = "On2 VP3",
+    .long_name = NULL_IF_CONFIG_SMALL("On2 VP3"),
 };
diff -r b252326ba895 -r e943e1409077 vp5.c
--- a/vp5.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vp5.c	Thu Jun 12 21:50:13 2008 +0000
@@ -292,5 +292,5 @@
     vp56_free,
     vp56_decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "On2 VP5",
+    .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"),
 };
diff -r b252326ba895 -r e943e1409077 vp6.c
--- a/vp6.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vp6.c	Thu Jun 12 21:50:13 2008 +0000
@@ -638,7 +638,7 @@
     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 @@
     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 @@
     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 -r b252326ba895 -r e943e1409077 vqavideo.c
--- a/vqavideo.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/vqavideo.c	Thu Jun 12 21:50:13 2008 +0000
@@ -616,5 +616,5 @@
     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 -r b252326ba895 -r e943e1409077 wavpack.c
--- a/wavpack.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/wavpack.c	Thu Jun 12 21:50:13 2008 +0000
@@ -582,5 +582,5 @@
     NULL,
     NULL,
     wavpack_decode_frame,
-    .long_name = "WavPack",
+    .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
 };
diff -r b252326ba895 -r e943e1409077 wmadec.c
--- a/wmadec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/wmadec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -862,7 +862,7 @@
     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 @@
     NULL,
     ff_wma_end,
     wma_decode_superframe,
-    .long_name = "Windows Media Audio 2",
+    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 };
diff -r b252326ba895 -r e943e1409077 wmaenc.c
--- a/wmaenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/wmaenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -387,7 +387,7 @@
     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 @@
     encode_init,
     encode_superframe,
     ff_wma_end,
-    .long_name = "Windows Media Audio 2",
+    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 };
diff -r b252326ba895 -r e943e1409077 wmv2dec.c
--- a/wmv2dec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/wmv2dec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -492,5 +492,5 @@
     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 -r b252326ba895 -r e943e1409077 wmv2enc.c
--- a/wmv2enc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/wmv2enc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -237,5 +237,5 @@
     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 -r b252326ba895 -r e943e1409077 wnv1.c
--- a/wnv1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/wnv1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -141,5 +141,5 @@
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Winnov WNV1",
+    .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"),
 };
diff -r b252326ba895 -r e943e1409077 ws-snd1.c
--- a/ws-snd1.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/ws-snd1.c	Thu Jun 12 21:50:13 2008 +0000
@@ -149,5 +149,5 @@
     NULL,
     NULL,
     ws_snd_decode_frame,
-    .long_name = "Westwood Audio (SND1)",
+    .long_name = NULL_IF_CONFIG_SMALL("Westwood Audio (SND1)"),
 };
diff -r b252326ba895 -r e943e1409077 xan.c
--- a/xan.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/xan.c	Thu Jun 12 21:50:13 2008 +0000
@@ -471,7 +471,7 @@
     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 -r b252326ba895 -r e943e1409077 xl.c
--- a/xl.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/xl.c	Thu Jun 12 21:50:13 2008 +0000
@@ -135,5 +135,5 @@
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
-    .long_name = "Miro VideoXL",
+    .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
 };
diff -r b252326ba895 -r e943e1409077 xsubdec.c
--- a/xsubdec.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/xsubdec.c	Thu Jun 12 21:50:13 2008 +0000
@@ -133,5 +133,5 @@
     NULL,
     NULL,
     decode_frame,
-    .long_name = "XSUB",
+    .long_name = NULL_IF_CONFIG_SMALL("XSUB"),
 };
diff -r b252326ba895 -r e943e1409077 zmbv.c
--- a/zmbv.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/zmbv.c	Thu Jun 12 21:50:13 2008 +0000
@@ -662,6 +662,6 @@
     NULL,
     decode_end,
     decode_frame,
-    .long_name = "Zip Motion Blocks Video",
+    .long_name = NULL_IF_CONFIG_SMALL("Zip Motion Blocks Video"),
 };
 
diff -r b252326ba895 -r e943e1409077 zmbvenc.c
--- a/zmbvenc.c	Tue Jun 10 19:21:40 2008 +0000
+++ b/zmbvenc.c	Thu Jun 12 21:50:13 2008 +0000
@@ -330,5 +330,5 @@
     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"),
 };