# HG changeset patch
# User diego
# Date 1212510054 0
# Node ID 7a023098140298e3c66acadf6d75f8b7010a82b7
# Parent  613aff5476551047b3d0938936f880703b595641
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

diff -r 613aff547655 -r 7a0230981402 4xm.c
--- a/4xm.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/4xm.c	Tue Jun 03 16:20:54 2008 +0000
@@ -328,7 +328,7 @@
 
 AVInputFormat fourxm_demuxer = {
     "4xm",
-    "4X Technologies format",
+    NULL_IF_CONFIG_SMALL("4X Technologies format"),
     sizeof(FourxmDemuxContext),
     fourxm_probe,
     fourxm_read_header,
diff -r 613aff547655 -r 7a0230981402 adtsenc.c
--- a/adtsenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/adtsenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -107,7 +107,7 @@
 
 AVOutputFormat adts_muxer = {
     "adts",
-    "ADTS AAC",
+    NULL_IF_CONFIG_SMALL("ADTS AAC"),
     "audio/aac",
     "aac",
     sizeof(ADTSContext),
diff -r 613aff547655 -r 7a0230981402 aiff.c
--- a/aiff.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/aiff.c	Tue Jun 03 16:20:54 2008 +0000
@@ -442,7 +442,7 @@
 #ifdef CONFIG_AIFF_DEMUXER
 AVInputFormat aiff_demuxer = {
     "aiff",
-    "Audio IFF",
+    NULL_IF_CONFIG_SMALL("Audio IFF"),
     0,
     aiff_probe,
     aiff_read_header,
@@ -456,7 +456,7 @@
 #ifdef CONFIG_AIFF_MUXER
 AVOutputFormat aiff_muxer = {
     "aiff",
-    "Audio IFF",
+    NULL_IF_CONFIG_SMALL("Audio IFF"),
     "audio/aiff",
     "aif,aiff,afc,aifc",
     sizeof(AIFFOutputContext),
diff -r 613aff547655 -r 7a0230981402 amr.c
--- a/amr.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/amr.c	Tue Jun 03 16:20:54 2008 +0000
@@ -169,7 +169,7 @@
 #ifdef CONFIG_AMR_DEMUXER
 AVInputFormat amr_demuxer = {
     "amr",
-    "3gpp amr file format",
+    NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
     0, /*priv_data_size*/
     amr_probe,
     amr_read_header,
@@ -181,7 +181,7 @@
 #ifdef CONFIG_AMR_MUXER
 AVOutputFormat amr_muxer = {
     "amr",
-    "3gpp amr file format",
+    NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
     "audio/amr",
     "amr",
     0,
diff -r 613aff547655 -r 7a0230981402 apc.c
--- a/apc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/apc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -82,7 +82,7 @@
 
 AVInputFormat apc_demuxer = {
     "apc",
-    "CRYO APC format",
+    NULL_IF_CONFIG_SMALL("CRYO APC format"),
     0,
     apc_probe,
     apc_read_header,
diff -r 613aff547655 -r 7a0230981402 ape.c
--- a/ape.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/ape.c	Tue Jun 03 16:20:54 2008 +0000
@@ -511,7 +511,7 @@
 
 AVInputFormat ape_demuxer = {
     "ape",
-    "Monkey's Audio",
+    NULL_IF_CONFIG_SMALL("Monkey's Audio"),
     sizeof(APEContext),
     ape_probe,
     ape_read_header,
diff -r 613aff547655 -r 7a0230981402 asf-enc.c
--- a/asf-enc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/asf-enc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -815,7 +815,7 @@
 #ifdef CONFIG_ASF_MUXER
 AVOutputFormat asf_muxer = {
     "asf",
-    "asf format",
+    NULL_IF_CONFIG_SMALL("ASF format"),
     "video/x-ms-asf",
     "asf,wmv,wma",
     sizeof(ASFContext),
@@ -836,7 +836,7 @@
 #ifdef CONFIG_ASF_STREAM_MUXER
 AVOutputFormat asf_stream_muxer = {
     "asf_stream",
-    "asf format",
+    NULL_IF_CONFIG_SMALL("ASF format"),
     "video/x-ms-asf",
     "asf,wmv,wma",
     sizeof(ASFContext),
diff -r 613aff547655 -r 7a0230981402 asf.c
--- a/asf.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/asf.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1094,7 +1094,7 @@
 
 AVInputFormat asf_demuxer = {
     "asf",
-    "asf format",
+    NULL_IF_CONFIG_SMALL("ASF format"),
     sizeof(ASFContext),
     asf_probe,
     asf_read_header,
diff -r 613aff547655 -r 7a0230981402 au.c
--- a/au.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/au.c	Tue Jun 03 16:20:54 2008 +0000
@@ -180,7 +180,7 @@
 #ifdef CONFIG_AU_DEMUXER
 AVInputFormat au_demuxer = {
     "au",
-    "SUN AU Format",
+    NULL_IF_CONFIG_SMALL("SUN AU format"),
     0,
     au_probe,
     au_read_header,
@@ -194,7 +194,7 @@
 #ifdef CONFIG_AU_MUXER
 AVOutputFormat au_muxer = {
     "au",
-    "SUN AU Format",
+    NULL_IF_CONFIG_SMALL("SUN AU format"),
     "audio/basic",
     "au",
     0,
diff -r 613aff547655 -r 7a0230981402 avformat.h
--- a/avformat.h	Tue Jun 03 15:19:43 2008 +0000
+++ b/avformat.h	Tue Jun 03 16:20:54 2008 +0000
@@ -185,6 +185,11 @@
 
 typedef struct AVOutputFormat {
     const char *name;
+    /**
+     * Descriptive name for the format, 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 char *mime_type;
     const char *extensions; /**< comma separated filename extensions */
@@ -216,6 +221,11 @@
 
 typedef struct AVInputFormat {
     const char *name;
+    /**
+     * Descriptive name for the format, 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;
     /** size of private data so that it can be allocated in the wrapper */
     int priv_data_size;
diff -r 613aff547655 -r 7a0230981402 avidec.c
--- a/avidec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/avidec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1087,7 +1087,7 @@
 
 AVInputFormat avi_demuxer = {
     "avi",
-    "avi format",
+    NULL_IF_CONFIG_SMALL("AVI format"),
     sizeof(AVIContext),
     avi_probe,
     avi_read_header,
diff -r 613aff547655 -r 7a0230981402 avienc.c
--- a/avienc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/avienc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -593,7 +593,7 @@
 
 AVOutputFormat avi_muxer = {
     "avi",
-    "avi format",
+    NULL_IF_CONFIG_SMALL("AVI format"),
     "video/x-msvideo",
     "avi",
     sizeof(AVIContext),
diff -r 613aff547655 -r 7a0230981402 avisynth.c
--- a/avisynth.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/avisynth.c	Tue Jun 03 16:20:54 2008 +0000
@@ -209,7 +209,7 @@
 
 AVInputFormat avisynth_demuxer = {
   "avs",
-  "AVISynth",
+  NULL_IF_CONFIG_SMALL("AVISynth"),
   sizeof(AVISynthContext),
   NULL,
   avisynth_read_header,
diff -r 613aff547655 -r 7a0230981402 avs.c
--- a/avs.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/avs.c	Tue Jun 03 16:20:54 2008 +0000
@@ -217,7 +217,7 @@
 
 AVInputFormat avs_demuxer = {
     "avs",
-    "avs format",
+    NULL_IF_CONFIG_SMALL("AVS format"),
     sizeof(avs_format_t),
     avs_probe,
     avs_read_header,
diff -r 613aff547655 -r 7a0230981402 bethsoftvid.c
--- a/bethsoftvid.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/bethsoftvid.c	Tue Jun 03 16:20:54 2008 +0000
@@ -225,7 +225,7 @@
 
 AVInputFormat bethsoftvid_demuxer = {
     "bethsoftvid",
-    "Bethesda Softworks 'Daggerfall' VID format",
+    NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"),
     sizeof(BVID_DemuxContext),
     vid_probe,
     vid_read_header,
diff -r 613aff547655 -r 7a0230981402 bfi.c
--- a/bfi.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/bfi.c	Tue Jun 03 16:20:54 2008 +0000
@@ -159,7 +159,7 @@
 
 AVInputFormat bfi_demuxer = {
     "bfi",
-    "Brute Force & Ignorance",
+    NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
     sizeof(BFIContext),
     bfi_probe,
     bfi_read_header,
diff -r 613aff547655 -r 7a0230981402 c93.c
--- a/c93.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/c93.c	Tue Jun 03 16:20:54 2008 +0000
@@ -190,7 +190,7 @@
 
 AVInputFormat c93_demuxer = {
     "c93",
-    "Interplay C93",
+    NULL_IF_CONFIG_SMALL("Interplay C93"),
     sizeof(C93DemuxContext),
     probe,
     read_header,
diff -r 613aff547655 -r 7a0230981402 crcenc.c
--- a/crcenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/crcenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -56,7 +56,7 @@
 
 AVOutputFormat crc_muxer = {
     "crc",
-    "crc testing format",
+    NULL_IF_CONFIG_SMALL("CRC testing format"),
     NULL,
     "",
     sizeof(CRCState),
diff -r 613aff547655 -r 7a0230981402 daud.c
--- a/daud.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/daud.c	Tue Jun 03 16:20:54 2008 +0000
@@ -49,7 +49,7 @@
 
 AVInputFormat daud_demuxer = {
     "daud",
-    "D-Cinema audio format",
+    NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
     0,
     NULL,
     daud_header,
diff -r 613aff547655 -r 7a0230981402 dsicin.c
--- a/dsicin.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/dsicin.c	Tue Jun 03 16:20:54 2008 +0000
@@ -213,7 +213,7 @@
 
 AVInputFormat dsicin_demuxer = {
     "dsicin",
-    "Delphine Software International CIN format",
+    NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"),
     sizeof(CinDemuxContext),
     cin_probe,
     cin_read_header,
diff -r 613aff547655 -r 7a0230981402 dv.c
--- a/dv.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/dv.c	Tue Jun 03 16:20:54 2008 +0000
@@ -440,7 +440,7 @@
 #ifdef CONFIG_DV_DEMUXER
 AVInputFormat dv_demuxer = {
     "dv",
-    "DV video format",
+    NULL_IF_CONFIG_SMALL("DV video format"),
     sizeof(RawDVContext),
     NULL,
     dv_read_header,
diff -r 613aff547655 -r 7a0230981402 dvenc.c
--- a/dvenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/dvenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -402,7 +402,7 @@
 #ifdef CONFIG_DV_MUXER
 AVOutputFormat dv_muxer = {
     "dv",
-    "DV video format",
+    NULL_IF_CONFIG_SMALL("DV video format"),
     NULL,
     "dv",
     sizeof(DVMuxContext),
diff -r 613aff547655 -r 7a0230981402 dxa.c
--- a/dxa.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/dxa.c	Tue Jun 03 16:20:54 2008 +0000
@@ -204,7 +204,7 @@
 
 AVInputFormat dxa_demuxer = {
     "dxa",
-    "dxa",
+    NULL_IF_CONFIG_SMALL("DXA"),
     sizeof(DXAContext),
     dxa_probe,
     dxa_read_header,
diff -r 613aff547655 -r 7a0230981402 eacdata.c
--- a/eacdata.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/eacdata.c	Tue Jun 03 16:20:54 2008 +0000
@@ -91,7 +91,7 @@
 
 AVInputFormat ea_cdata_demuxer = {
     "ea_cdata",
-    "Electronic Arts cdata",
+    NULL_IF_CONFIG_SMALL("Electronic Arts cdata"),
     sizeof(CdataDemuxContext),
     cdata_probe,
     cdata_read_header,
diff -r 613aff547655 -r 7a0230981402 electronicarts.c
--- a/electronicarts.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/electronicarts.c	Tue Jun 03 16:20:54 2008 +0000
@@ -465,7 +465,7 @@
 
 AVInputFormat ea_demuxer = {
     "ea",
-    "Electronic Arts Multimedia Format",
+    NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
     sizeof(EaDemuxContext),
     ea_probe,
     ea_read_header,
diff -r 613aff547655 -r 7a0230981402 ffmdec.c
--- a/ffmdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/ffmdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -480,7 +480,7 @@
 
 AVInputFormat ffm_demuxer = {
     "ffm",
-    "ffm format",
+    NULL_IF_CONFIG_SMALL("ffm format"),
     sizeof(FFMContext),
     ffm_probe,
     ffm_read_header,
diff -r 613aff547655 -r 7a0230981402 ffmenc.c
--- a/ffmenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/ffmenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -253,7 +253,7 @@
 
 AVOutputFormat ffm_muxer = {
     "ffm",
-    "ffm format",
+    NULL_IF_CONFIG_SMALL("ffm format"),
     "",
     "ffm",
     sizeof(FFMContext),
diff -r 613aff547655 -r 7a0230981402 flic.c
--- a/flic.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/flic.c	Tue Jun 03 16:20:54 2008 +0000
@@ -194,7 +194,7 @@
 
 AVInputFormat flic_demuxer = {
     "flic",
-    "FLI/FLC/FLX animation format",
+    NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
     sizeof(FlicDemuxContext),
     flic_probe,
     flic_read_header,
diff -r 613aff547655 -r 7a0230981402 flvdec.c
--- a/flvdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/flvdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -419,7 +419,7 @@
 
 AVInputFormat flv_demuxer = {
     "flv",
-    "flv format",
+    NULL_IF_CONFIG_SMALL("FLV format"),
     0,
     flv_probe,
     flv_read_header,
diff -r 613aff547655 -r 7a0230981402 flvenc.c
--- a/flvenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/flvenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -374,7 +374,7 @@
 
 AVOutputFormat flv_muxer = {
     "flv",
-    "flv format",
+    NULL_IF_CONFIG_SMALL("FLV format"),
     "video/x-flv",
     "flv",
     sizeof(FLVContext),
diff -r 613aff547655 -r 7a0230981402 framecrcenc.c
--- a/framecrcenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/framecrcenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -35,7 +35,7 @@
 
 AVOutputFormat framecrc_muxer = {
     "framecrc",
-    "framecrc testing format",
+    NULL_IF_CONFIG_SMALL("framecrc testing format"),
     NULL,
     "",
     0,
diff -r 613aff547655 -r 7a0230981402 gif.c
--- a/gif.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/gif.c	Tue Jun 03 16:20:54 2008 +0000
@@ -407,7 +407,7 @@
 
 AVOutputFormat gif_muxer = {
     "gif",
-    "GIF Animation",
+    NULL_IF_CONFIG_SMALL("GIF Animation"),
     "image/gif",
     "gif",
     sizeof(GIFContext),
diff -r 613aff547655 -r 7a0230981402 gifdec.c
--- a/gifdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/gifdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -581,7 +581,7 @@
 AVInputFormat gif_demuxer =
 {
     "gif",
-    "gif format",
+    NULL_IF_CONFIG_SMALL("GIF format"),
     sizeof(GifState),
     gif_video_probe,
     gif_read_header,
diff -r 613aff547655 -r 7a0230981402 gxf.c
--- a/gxf.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/gxf.c	Tue Jun 03 16:20:54 2008 +0000
@@ -492,7 +492,7 @@
 
 AVInputFormat gxf_demuxer = {
     "gxf",
-    "GXF format",
+    NULL_IF_CONFIG_SMALL("GXF format"),
     0,
     gxf_probe,
     gxf_header,
diff -r 613aff547655 -r 7a0230981402 gxfenc.c
--- a/gxfenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/gxfenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -813,7 +813,7 @@
 
 AVOutputFormat gxf_muxer = {
     "gxf",
-    "GXF format",
+    NULL_IF_CONFIG_SMALL("GXF format"),
     NULL,
     "gxf",
     sizeof(GXFContext),
diff -r 613aff547655 -r 7a0230981402 idcin.c
--- a/idcin.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/idcin.c	Tue Jun 03 16:20:54 2008 +0000
@@ -288,7 +288,7 @@
 
 AVInputFormat idcin_demuxer = {
     "idcin",
-    "Id CIN format",
+    NULL_IF_CONFIG_SMALL("Id CIN format"),
     sizeof(IdcinDemuxContext),
     idcin_probe,
     idcin_read_header,
diff -r 613aff547655 -r 7a0230981402 idroq.c
--- a/idroq.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/idroq.c	Tue Jun 03 16:20:54 2008 +0000
@@ -279,7 +279,7 @@
 
 AVInputFormat roq_demuxer = {
     "RoQ",
-    "Id RoQ format",
+    NULL_IF_CONFIG_SMALL("Id RoQ format"),
     sizeof(RoqDemuxContext),
     roq_probe,
     roq_read_header,
diff -r 613aff547655 -r 7a0230981402 iff.c
--- a/iff.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/iff.c	Tue Jun 03 16:20:54 2008 +0000
@@ -192,7 +192,7 @@
 
 AVInputFormat iff_demuxer = {
     "IFF",
-    "IFF format",
+    NULL_IF_CONFIG_SMALL("IFF format"),
     sizeof(IffDemuxContext),
     iff_probe,
     iff_read_header,
diff -r 613aff547655 -r 7a0230981402 img2.c
--- a/img2.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/img2.c	Tue Jun 03 16:20:54 2008 +0000
@@ -379,7 +379,7 @@
 #ifdef CONFIG_IMAGE2_DEMUXER
 AVInputFormat image2_demuxer = {
     "image2",
-    "image2 sequence",
+    NULL_IF_CONFIG_SMALL("image2 sequence"),
     sizeof(VideoData),
     image_probe,
     img_read_header,
@@ -393,7 +393,7 @@
 #ifdef CONFIG_IMAGE2PIPE_DEMUXER
 AVInputFormat image2pipe_demuxer = {
     "image2pipe",
-    "piped image2 sequence",
+    NULL_IF_CONFIG_SMALL("piped image2 sequence"),
     sizeof(VideoData),
     NULL, /* no probe */
     img_read_header,
@@ -407,7 +407,7 @@
 #ifdef CONFIG_IMAGE2_MUXER
 AVOutputFormat image2_muxer = {
     "image2",
-    "image2 sequence",
+    NULL_IF_CONFIG_SMALL("image2 sequence"),
     "",
     "",
     sizeof(VideoData),
@@ -422,7 +422,7 @@
 #ifdef CONFIG_IMAGE2PIPE_MUXER
 AVOutputFormat image2pipe_muxer = {
     "image2pipe",
-    "piped image2 sequence",
+    NULL_IF_CONFIG_SMALL("piped image2 sequence"),
     "",
     "",
     sizeof(VideoData),
diff -r 613aff547655 -r 7a0230981402 ipmovie.c
--- a/ipmovie.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/ipmovie.c	Tue Jun 03 16:20:54 2008 +0000
@@ -616,7 +616,7 @@
 
 AVInputFormat ipmovie_demuxer = {
     "ipmovie",
-    "Interplay MVE format",
+    NULL_IF_CONFIG_SMALL("Interplay MVE format"),
     sizeof(IPMVEContext),
     ipmovie_probe,
     ipmovie_read_header,
diff -r 613aff547655 -r 7a0230981402 libnut.c
--- a/libnut.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/libnut.c	Tue Jun 03 16:20:54 2008 +0000
@@ -299,7 +299,7 @@
 
 AVInputFormat libnut_demuxer = {
     "libnut",
-    "nut format",
+    NULL_IF_CONFIG_SMALL("NUT format"),
     sizeof(NUTContext),
     nut_probe,
     nut_read_header,
diff -r 613aff547655 -r 7a0230981402 lmlm4.c
--- a/lmlm4.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/lmlm4.c	Tue Jun 03 16:20:54 2008 +0000
@@ -118,7 +118,7 @@
 
 AVInputFormat lmlm4_demuxer = {
     "lmlm4",
-    "lmlm4 raw format",
+    NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
     0,
     lmlm4_probe,
     lmlm4_read_header,
diff -r 613aff547655 -r 7a0230981402 matroskadec.c
--- a/matroskadec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/matroskadec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -3248,7 +3248,7 @@
 
 AVInputFormat matroska_demuxer = {
     "matroska",
-    "Matroska file format",
+    NULL_IF_CONFIG_SMALL("Matroska file format"),
     sizeof(MatroskaDemuxContext),
     matroska_probe,
     matroska_read_header,
diff -r 613aff547655 -r 7a0230981402 matroskaenc.c
--- a/matroskaenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/matroskaenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -819,7 +819,7 @@
 
 AVOutputFormat matroska_muxer = {
     "matroska",
-    "Matroska File Format",
+    NULL_IF_CONFIG_SMALL("Matroska file format"),
     "video/x-matroska",
     "mkv",
     sizeof(MatroskaMuxContext),
@@ -834,7 +834,7 @@
 
 AVOutputFormat matroska_audio_muxer = {
     "matroska",
-    "Matroska File Format",
+    NULL_IF_CONFIG_SMALL("Matroska file format"),
     "audio/x-matroska",
     "mka",
     sizeof(MatroskaMuxContext),
diff -r 613aff547655 -r 7a0230981402 mm.c
--- a/mm.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mm.c	Tue Jun 03 16:20:54 2008 +0000
@@ -201,7 +201,7 @@
 
 AVInputFormat mm_demuxer = {
     "mm",
-    "American Laser Games MM format",
+    NULL_IF_CONFIG_SMALL("American Laser Games MM format"),
     sizeof(MmDemuxContext),
     mm_probe,
     mm_read_header,
diff -r 613aff547655 -r 7a0230981402 mmf.c
--- a/mmf.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mmf.c	Tue Jun 03 16:20:54 2008 +0000
@@ -304,7 +304,7 @@
 #ifdef CONFIG_MMF_DEMUXER
 AVInputFormat mmf_demuxer = {
     "mmf",
-    "mmf format",
+    NULL_IF_CONFIG_SMALL("mmf format"),
     sizeof(MMFContext),
     mmf_probe,
     mmf_read_header,
@@ -316,7 +316,7 @@
 #ifdef CONFIG_MMF_MUXER
 AVOutputFormat mmf_muxer = {
     "mmf",
-    "mmf format",
+    NULL_IF_CONFIG_SMALL("mmf format"),
     "application/vnd.smaf",
     "mmf",
     sizeof(MMFContext),
diff -r 613aff547655 -r 7a0230981402 mov.c
--- a/mov.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mov.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1914,7 +1914,7 @@
 
 AVInputFormat mov_demuxer = {
     "mov,mp4,m4a,3gp,3g2,mj2",
-    "QuickTime/MPEG4/Motion JPEG 2000 format",
+    NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),
     sizeof(MOVContext),
     mov_probe,
     mov_read_header,
diff -r 613aff547655 -r 7a0230981402 movenc.c
--- a/movenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/movenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1666,7 +1666,7 @@
 #ifdef CONFIG_MOV_MUXER
 AVOutputFormat mov_muxer = {
     "mov",
-    "mov format",
+    NULL_IF_CONFIG_SMALL("MOV format"),
     NULL,
     "mov",
     sizeof(MOVContext),
@@ -1682,7 +1682,7 @@
 #ifdef CONFIG_TGP_MUXER
 AVOutputFormat tgp_muxer = {
     "3gp",
-    "3gp format",
+    NULL_IF_CONFIG_SMALL("3GP format"),
     NULL,
     "3gp",
     sizeof(MOVContext),
@@ -1698,7 +1698,7 @@
 #ifdef CONFIG_MP4_MUXER
 AVOutputFormat mp4_muxer = {
     "mp4",
-    "mp4 format",
+    NULL_IF_CONFIG_SMALL("MP4 format"),
     "application/mp4",
     "mp4,m4a",
     sizeof(MOVContext),
@@ -1714,7 +1714,7 @@
 #ifdef CONFIG_PSP_MUXER
 AVOutputFormat psp_muxer = {
     "psp",
-    "psp mp4 format",
+    NULL_IF_CONFIG_SMALL("PSP MP4 format"),
     NULL,
     "mp4,psp",
     sizeof(MOVContext),
@@ -1730,7 +1730,7 @@
 #ifdef CONFIG_TG2_MUXER
 AVOutputFormat tg2_muxer = {
     "3g2",
-    "3gp2 format",
+    NULL_IF_CONFIG_SMALL("3GP2 format"),
     NULL,
     "3g2",
     sizeof(MOVContext),
@@ -1746,7 +1746,7 @@
 #ifdef CONFIG_IPOD_MUXER
 AVOutputFormat ipod_muxer = {
     "ipod",
-    "iPod H.264 mp4 format",
+    NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"),
     "application/mp4",
     NULL,
     sizeof(MOVContext),
diff -r 613aff547655 -r 7a0230981402 mp3.c
--- a/mp3.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mp3.c	Tue Jun 03 16:20:54 2008 +0000
@@ -646,7 +646,7 @@
 #ifdef CONFIG_MP3_DEMUXER
 AVInputFormat mp3_demuxer = {
     "mp3",
-    "MPEG audio",
+    NULL_IF_CONFIG_SMALL("MPEG audio"),
     0,
     mp3_read_probe,
     mp3_read_header,
@@ -659,7 +659,7 @@
 #ifdef CONFIG_MP2_MUXER
 AVOutputFormat mp2_muxer = {
     "mp2",
-    "MPEG audio layer 2",
+    NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
     "audio/x-mpeg",
 #ifdef CONFIG_LIBMP3LAME
     "mp2,m2a",
@@ -677,7 +677,7 @@
 #ifdef CONFIG_MP3_MUXER
 AVOutputFormat mp3_muxer = {
     "mp3",
-    "MPEG audio layer 3",
+    NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),
     "audio/x-mpeg",
     "mp3",
     0,
diff -r 613aff547655 -r 7a0230981402 mpc.c
--- a/mpc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mpc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -219,7 +219,7 @@
 
 AVInputFormat mpc_demuxer = {
     "mpc",
-    "musepack",
+    NULL_IF_CONFIG_SMALL("Musepack"),
     sizeof(MPCContext),
     mpc_probe,
     mpc_read_header,
diff -r 613aff547655 -r 7a0230981402 mpc8.c
--- a/mpc8.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mpc8.c	Tue Jun 03 16:20:54 2008 +0000
@@ -235,7 +235,7 @@
 
 AVInputFormat mpc8_demuxer = {
     "mpc8",
-    "musepack8",
+    NULL_IF_CONFIG_SMALL("Musepack SV8"),
     sizeof(MPCContext),
     mpc8_probe,
     mpc8_read_header,
diff -r 613aff547655 -r 7a0230981402 mpeg.c
--- a/mpeg.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mpeg.c	Tue Jun 03 16:20:54 2008 +0000
@@ -583,7 +583,7 @@
 
 AVInputFormat mpegps_demuxer = {
     "mpeg",
-    "MPEG PS format",
+    NULL_IF_CONFIG_SMALL("MPEG-PS format"),
     sizeof(MpegDemuxContext),
     mpegps_probe,
     mpegps_read_header,
diff -r 613aff547655 -r 7a0230981402 mpegenc.c
--- a/mpegenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mpegenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1221,7 +1221,7 @@
 #ifdef CONFIG_MPEG1SYSTEM_MUXER
 AVOutputFormat mpeg1system_muxer = {
     "mpeg",
-    "MPEG1 System format",
+    NULL_IF_CONFIG_SMALL("MPEG-1 System format"),
     "video/mpeg",
     "mpg,mpeg",
     sizeof(MpegMuxContext),
@@ -1235,7 +1235,7 @@
 #ifdef CONFIG_MPEG1VCD_MUXER
 AVOutputFormat mpeg1vcd_muxer = {
     "vcd",
-    "MPEG1 System format (VCD)",
+    NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"),
     "video/mpeg",
     NULL,
     sizeof(MpegMuxContext),
@@ -1249,7 +1249,7 @@
 #ifdef CONFIG_MPEG2VOB_MUXER
 AVOutputFormat mpeg2vob_muxer = {
     "vob",
-    "MPEG2 PS format (VOB)",
+    NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
     "video/mpeg",
     "vob",
     sizeof(MpegMuxContext),
@@ -1265,7 +1265,7 @@
 #ifdef CONFIG_MPEG2SVCD_MUXER
 AVOutputFormat mpeg2svcd_muxer = {
     "svcd",
-    "MPEG2 PS format (VOB)",
+    NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),
     "video/mpeg",
     "vob",
     sizeof(MpegMuxContext),
@@ -1281,7 +1281,7 @@
 #ifdef CONFIG_MPEG2DVD_MUXER
 AVOutputFormat mpeg2dvd_muxer = {
     "dvd",
-    "MPEG2 PS format (DVD VOB)",
+    NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"),
     "video/mpeg",
     "dvd",
     sizeof(MpegMuxContext),
diff -r 613aff547655 -r 7a0230981402 mpegts.c
--- a/mpegts.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mpegts.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1499,7 +1499,7 @@
 
 AVInputFormat mpegts_demuxer = {
     "mpegts",
-    "MPEG2 transport stream format",
+    NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
     sizeof(MpegTSContext),
     mpegts_probe,
     mpegts_read_header,
@@ -1512,7 +1512,7 @@
 
 AVInputFormat mpegtsraw_demuxer = {
     "mpegtsraw",
-    "MPEG2 raw transport stream format",
+    NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),
     sizeof(MpegTSContext),
     NULL,
     mpegts_read_header,
diff -r 613aff547655 -r 7a0230981402 mpegtsenc.c
--- a/mpegtsenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mpegtsenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -684,7 +684,7 @@
 
 AVOutputFormat mpegts_muxer = {
     "mpegts",
-    "MPEG2 transport stream format",
+    NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
     "video/x-mpegts",
     "ts,m2t",
     sizeof(MpegTSWrite),
diff -r 613aff547655 -r 7a0230981402 mpjpeg.c
--- a/mpjpeg.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mpjpeg.c	Tue Jun 03 16:20:54 2008 +0000
@@ -55,7 +55,7 @@
 
 AVOutputFormat mpjpeg_muxer = {
     "mpjpeg",
-    "Mime multipart JPEG format",
+    NULL_IF_CONFIG_SMALL("Mime multipart JPEG format"),
     "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG,
     "mjpg",
     0,
diff -r 613aff547655 -r 7a0230981402 msnwc_tcp.c
--- a/msnwc_tcp.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/msnwc_tcp.c	Tue Jun 03 16:20:54 2008 +0000
@@ -132,7 +132,7 @@
 
 AVInputFormat msnwc_tcp_demuxer = {
     "msnwctcp",
-    "MSN TCP Webcam stream",
+    NULL_IF_CONFIG_SMALL("MSN TCP Webcam stream"),
     0,
     msnwc_tcp_probe,
     msnwc_tcp_read_header,
diff -r 613aff547655 -r 7a0230981402 mtv.c
--- a/mtv.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mtv.c	Tue Jun 03 16:20:54 2008 +0000
@@ -176,7 +176,7 @@
 
 AVInputFormat mtv_demuxer = {
     "MTV",
-    "MTV format",
+    NULL_IF_CONFIG_SMALL("MTV format"),
     sizeof(MTVDemuxContext),
     mtv_probe,
     mtv_read_header,
diff -r 613aff547655 -r 7a0230981402 mxf.c
--- a/mxf.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/mxf.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1061,7 +1061,7 @@
 
 AVInputFormat mxf_demuxer = {
     "mxf",
-    "MXF format",
+    NULL_IF_CONFIG_SMALL("MXF format"),
     sizeof(MXFContext),
     mxf_probe,
     mxf_read_header,
diff -r 613aff547655 -r 7a0230981402 nsvdec.c
--- a/nsvdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/nsvdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -751,7 +751,7 @@
 
 AVInputFormat nsv_demuxer = {
     "nsv",
-    "NullSoft Video format",
+    NULL_IF_CONFIG_SMALL("NullSoft Video format"),
     sizeof(NSVContext),
     nsv_probe,
     nsv_read_header,
diff -r 613aff547655 -r 7a0230981402 nutdec.c
--- a/nutdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/nutdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -908,7 +908,7 @@
 #ifdef CONFIG_NUT_DEMUXER
 AVInputFormat nut_demuxer = {
     "nut",
-    "nut format",
+    NULL_IF_CONFIG_SMALL("NUT format"),
     sizeof(NUTContext),
     nut_probe,
     nut_read_header,
diff -r 613aff547655 -r 7a0230981402 nutenc.c
--- a/nutenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/nutenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -802,7 +802,7 @@
 
 AVOutputFormat nut_muxer = {
     "nut",
-    "nut format",
+    NULL_IF_CONFIG_SMALL("NUT format"),
     "video/x-nut",
     "nut",
     sizeof(NUTContext),
diff -r 613aff547655 -r 7a0230981402 nuv.c
--- a/nuv.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/nuv.c	Tue Jun 03 16:20:54 2008 +0000
@@ -242,7 +242,7 @@
 
 AVInputFormat nuv_demuxer = {
     "nuv",
-    "NuppelVideo format",
+    NULL_IF_CONFIG_SMALL("NuppelVideo format"),
     sizeof(NUVContext),
     nuv_probe,
     nuv_header,
diff -r 613aff547655 -r 7a0230981402 oggdec.c
--- a/oggdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/oggdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -584,7 +584,7 @@
 
 AVInputFormat ogg_demuxer = {
     "ogg",
-    "Ogg",
+    NULL_IF_CONFIG_SMALL("Ogg"),
     sizeof (ogg_t),
     ogg_probe,
     ogg_read_header,
diff -r 613aff547655 -r 7a0230981402 oggenc.c
--- a/oggenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/oggenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -279,7 +279,7 @@
 
 AVOutputFormat ogg_muxer = {
     "ogg",
-    "Ogg format",
+    NULL_IF_CONFIG_SMALL("Ogg"),
     "application/ogg",
     "ogg",
     0,
diff -r 613aff547655 -r 7a0230981402 psxstr.c
--- a/psxstr.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/psxstr.c	Tue Jun 03 16:20:54 2008 +0000
@@ -351,7 +351,7 @@
 
 AVInputFormat str_demuxer = {
     "psxstr",
-    "Sony Playstation STR format",
+    NULL_IF_CONFIG_SMALL("Sony Playstation STR format"),
     sizeof(StrDemuxContext),
     str_probe,
     str_read_header,
diff -r 613aff547655 -r 7a0230981402 pva.c
--- a/pva.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/pva.c	Tue Jun 03 16:20:54 2008 +0000
@@ -202,7 +202,7 @@
 
 AVInputFormat pva_demuxer = {
     "pva",
-    "pva file and stream format",
+    NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"),
     sizeof(PVAContext),
     pva_probe,
     pva_read_header,
diff -r 613aff547655 -r 7a0230981402 raw.c
--- a/raw.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/raw.c	Tue Jun 03 16:20:54 2008 +0000
@@ -431,7 +431,7 @@
 
 AVInputFormat shorten_demuxer = {
     "shn",
-    "raw shorten",
+    NULL_IF_CONFIG_SMALL("raw Shorten"),
     0,
     NULL,
     audio_read_header,
@@ -444,7 +444,7 @@
 
 AVInputFormat mlp_demuxer = {
     "mlp",
-    "raw mlp",
+    NULL_IF_CONFIG_SMALL("raw MLP"),
     0,
     NULL,
     audio_read_header,
@@ -457,7 +457,7 @@
 
 AVInputFormat flac_demuxer = {
     "flac",
-    "raw flac",
+    NULL_IF_CONFIG_SMALL("raw FLAC"),
     0,
     flac_probe,
     audio_read_header,
@@ -471,7 +471,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat flac_muxer = {
     "flac",
-    "raw flac",
+    NULL_IF_CONFIG_SMALL("raw FLAC"),
     "audio/x-flac",
     "flac",
     0,
@@ -486,7 +486,7 @@
 #ifdef CONFIG_AC3_DEMUXER
 AVInputFormat ac3_demuxer = {
     "ac3",
-    "raw ac3",
+    NULL_IF_CONFIG_SMALL("raw AC-3"),
     0,
     ac3_probe,
     audio_read_header,
@@ -501,7 +501,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat ac3_muxer = {
     "ac3",
-    "raw ac3",
+    NULL_IF_CONFIG_SMALL("raw AC-3"),
     "audio/x-ac3",
     "ac3",
     0,
@@ -514,7 +514,7 @@
 
 AVOutputFormat dts_muxer = {
     "dts",
-    "raw dts",
+    NULL_IF_CONFIG_SMALL("raw DTS"),
     "audio/x-dca",
     "dts",
     0,
@@ -529,7 +529,7 @@
 
 AVInputFormat dirac_demuxer = {
     "dirac",
-    "raw dirac",
+    NULL_IF_CONFIG_SMALL("raw Dirac"),
     0,
     dirac_probe,
     video_read_header,
@@ -542,7 +542,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat dirac_muxer = {
     "dirac",
-    "raw dirac",
+    NULL_IF_CONFIG_SMALL("raw Dirac"),
     NULL,
     "drc",
     0,
@@ -556,7 +556,7 @@
 
 AVInputFormat dts_demuxer = {
     "dts",
-    "raw dts",
+    NULL_IF_CONFIG_SMALL("raw DTS"),
     0,
     dts_probe,
     audio_read_header,
@@ -569,7 +569,7 @@
 
 AVInputFormat aac_demuxer = {
     "aac",
-    "ADTS AAC",
+    NULL_IF_CONFIG_SMALL("ADTS AAC"),
     0,
     NULL,
     audio_read_header,
@@ -582,7 +582,7 @@
 
 AVInputFormat gsm_demuxer = {
     "gsm",
-    "GSM",
+    NULL_IF_CONFIG_SMALL("GSM"),
     0,
     NULL,
     audio_read_header,
@@ -597,7 +597,7 @@
 AVOutputFormat roq_muxer =
 {
     "RoQ",
-    "Id RoQ format",
+    NULL_IF_CONFIG_SMALL("Id RoQ format"),
     NULL,
     "roq",
     0,
@@ -610,7 +610,7 @@
 
 AVInputFormat h261_demuxer = {
     "h261",
-    "raw h261",
+    NULL_IF_CONFIG_SMALL("raw H.261"),
     0,
     h261_probe,
     video_read_header,
@@ -624,7 +624,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat h261_muxer = {
     "h261",
-    "raw h261",
+    NULL_IF_CONFIG_SMALL("raw H.261"),
     "video/x-h261",
     "h261",
     0,
@@ -638,7 +638,7 @@
 
 AVInputFormat h263_demuxer = {
     "h263",
-    "raw h263",
+    NULL_IF_CONFIG_SMALL("raw H.263"),
     0,
     h263_probe,
     video_read_header,
@@ -652,7 +652,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat h263_muxer = {
     "h263",
-    "raw h263",
+    NULL_IF_CONFIG_SMALL("raw H.263"),
     "video/x-h263",
     "h263",
     0,
@@ -666,7 +666,7 @@
 
 AVInputFormat m4v_demuxer = {
     "m4v",
-    "raw MPEG4 video format",
+    NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     0,
     mpeg4video_probe, /** probing for mpeg4 data */
     video_read_header,
@@ -680,7 +680,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat m4v_muxer = {
     "m4v",
-    "raw MPEG4 video format",
+    NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"),
     NULL,
     "m4v",
     0,
@@ -694,7 +694,7 @@
 
 AVInputFormat h264_demuxer = {
     "h264",
-    "raw H264 video format",
+    NULL_IF_CONFIG_SMALL("raw H.264 video format"),
     0,
     NULL /*mpegvideo_probe*/,
     video_read_header,
@@ -708,7 +708,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat h264_muxer = {
     "h264",
-    "raw H264 video format",
+    NULL_IF_CONFIG_SMALL("raw H.264 video format"),
     NULL,
     "h264",
     0,
@@ -722,7 +722,7 @@
 
 AVInputFormat mpegvideo_demuxer = {
     "mpegvideo",
-    "MPEG video",
+    NULL_IF_CONFIG_SMALL("MPEG video"),
     0,
     mpegvideo_probe,
     video_read_header,
@@ -735,7 +735,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat mpeg1video_muxer = {
     "mpeg1video",
-    "MPEG video",
+    NULL_IF_CONFIG_SMALL("MPEG video"),
     "video/x-mpeg",
     "mpg,mpeg,m1v",
     0,
@@ -750,7 +750,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat mpeg2video_muxer = {
     "mpeg2video",
-    "MPEG2 video",
+    NULL_IF_CONFIG_SMALL("MPEG-2 video"),
     NULL,
     "m2v",
     0,
@@ -764,7 +764,7 @@
 
 AVInputFormat mjpeg_demuxer = {
     "mjpeg",
-    "MJPEG video",
+    NULL_IF_CONFIG_SMALL("MJPEG video"),
     0,
     NULL,
     video_read_header,
@@ -777,7 +777,7 @@
 
 AVInputFormat ingenient_demuxer = {
     "ingenient",
-    "Ingenient MJPEG",
+    NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
     0,
     NULL,
     video_read_header,
@@ -791,7 +791,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat mjpeg_muxer = {
     "mjpeg",
-    "MJPEG video",
+    NULL_IF_CONFIG_SMALL("MJPEG video"),
     "video/x-mjpeg",
     "mjpg,mjpeg",
     0,
@@ -805,7 +805,7 @@
 
 AVInputFormat vc1_demuxer = {
     "vc1",
-    "raw vc1",
+    NULL_IF_CONFIG_SMALL("raw VC-1"),
     0,
     NULL /* vc1_probe */,
     video_read_header,
@@ -820,7 +820,7 @@
 #define PCMINPUTDEF(name, long_name, ext, codec) \
 AVInputFormat pcm_ ## name ## _demuxer = {\
     #name,\
-    long_name,\
+    NULL_IF_CONFIG_SMALL(long_name),\
     0,\
     NULL,\
     raw_read_header,\
@@ -835,7 +835,7 @@
 #define PCMOUTPUTDEF(name, long_name, ext, codec) \
 AVOutputFormat pcm_ ## name ## _muxer = {\
     #name,\
-    long_name,\
+    NULL_IF_CONFIG_SMALL(long_name),\
     NULL,\
     ext,\
     0,\
@@ -920,7 +920,7 @@
 
 AVInputFormat rawvideo_demuxer = {
     "rawvideo",
-    "raw video format",
+    NULL_IF_CONFIG_SMALL("raw video format"),
     0,
     NULL,
     raw_read_header,
@@ -934,7 +934,7 @@
 #ifdef CONFIG_MUXERS
 AVOutputFormat rawvideo_muxer = {
     "rawvideo",
-    "raw video format",
+    NULL_IF_CONFIG_SMALL("raw video format"),
     NULL,
     "yuv,rgb",
     0,
@@ -954,7 +954,7 @@
 
 AVOutputFormat null_muxer = {
     "null",
-    "null video format",
+    NULL_IF_CONFIG_SMALL("null video format"),
     NULL,
     NULL,
     0,
diff -r 613aff547655 -r 7a0230981402 rl2.c
--- a/rl2.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/rl2.c	Tue Jun 03 16:20:54 2008 +0000
@@ -288,7 +288,7 @@
 
 AVInputFormat rl2_demuxer = {
     "rl2",
-    "rl2 format",
+    NULL_IF_CONFIG_SMALL("rl2 format"),
     sizeof(Rl2DemuxContext),
     rl2_probe,
     rl2_read_header,
diff -r 613aff547655 -r 7a0230981402 rmdec.c
--- a/rmdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/rmdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -793,7 +793,7 @@
 
 AVInputFormat rm_demuxer = {
     "rm",
-    "rm format",
+    NULL_IF_CONFIG_SMALL("RM format"),
     sizeof(RMContext),
     rm_probe,
     rm_read_header,
diff -r 613aff547655 -r 7a0230981402 rmenc.c
--- a/rmenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/rmenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -432,7 +432,7 @@
 
 AVOutputFormat rm_muxer = {
     "rm",
-    "rm format",
+    NULL_IF_CONFIG_SMALL("RM format"),
     "application/vnd.rn-realmedia",
     "rm,ra",
     sizeof(RMContext),
diff -r 613aff547655 -r 7a0230981402 rpl.c
--- a/rpl.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/rpl.c	Tue Jun 03 16:20:54 2008 +0000
@@ -348,7 +348,7 @@
 
 AVInputFormat rpl_demuxer = {
     "rpl",
-    "RPL/ARMovie format",
+    NULL_IF_CONFIG_SMALL("RPL/ARMovie format"),
     sizeof(RPLContext),
     rpl_probe,
     rpl_read_header,
diff -r 613aff547655 -r 7a0230981402 rtpenc.c
--- a/rtpenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/rtpenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -356,7 +356,7 @@
 
 AVOutputFormat rtp_muxer = {
     "rtp",
-    "RTP output format",
+    NULL_IF_CONFIG_SMALL("RTP output format"),
     NULL,
     NULL,
     sizeof(RTPDemuxContext),
diff -r 613aff547655 -r 7a0230981402 rtsp.c
--- a/rtsp.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/rtsp.c	Tue Jun 03 16:20:54 2008 +0000
@@ -1354,7 +1354,7 @@
 #ifdef CONFIG_RTSP_DEMUXER
 AVInputFormat rtsp_demuxer = {
     "rtsp",
-    "RTSP input format",
+    NULL_IF_CONFIG_SMALL("RTSP input format"),
     sizeof(RTSPState),
     rtsp_probe,
     rtsp_read_header,
@@ -1462,7 +1462,7 @@
 #ifdef CONFIG_SDP_DEMUXER
 AVInputFormat sdp_demuxer = {
     "sdp",
-    "SDP",
+    NULL_IF_CONFIG_SMALL("SDP"),
     sizeof(RTSPState),
     sdp_probe,
     sdp_read_header,
@@ -1529,7 +1529,7 @@
 
 AVInputFormat redir_demuxer = {
     "redir",
-    "Redirector format",
+    NULL_IF_CONFIG_SMALL("Redirector format"),
     0,
     redir_probe,
     redir_read_header,
diff -r 613aff547655 -r 7a0230981402 segafilm.c
--- a/segafilm.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/segafilm.c	Tue Jun 03 16:20:54 2008 +0000
@@ -283,7 +283,7 @@
 
 AVInputFormat segafilm_demuxer = {
     "film_cpk",
-    "Sega FILM/CPK format",
+    NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"),
     sizeof(FilmDemuxContext),
     film_probe,
     film_read_header,
diff -r 613aff547655 -r 7a0230981402 sierravmd.c
--- a/sierravmd.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/sierravmd.c	Tue Jun 03 16:20:54 2008 +0000
@@ -291,7 +291,7 @@
 
 AVInputFormat vmd_demuxer = {
     "vmd",
-    "Sierra VMD format",
+    NULL_IF_CONFIG_SMALL("Sierra VMD format"),
     sizeof(VmdDemuxContext),
     vmd_probe,
     vmd_read_header,
diff -r 613aff547655 -r 7a0230981402 siff.c
--- a/siff.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/siff.c	Tue Jun 03 16:20:54 2008 +0000
@@ -227,7 +227,7 @@
 
 AVInputFormat siff_demuxer = {
     "siff",
-    "Beam Software SIFF",
+    NULL_IF_CONFIG_SMALL("Beam Software SIFF"),
     sizeof(SIFFContext),
     siff_probe,
     siff_read_header,
diff -r 613aff547655 -r 7a0230981402 smacker.c
--- a/smacker.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/smacker.c	Tue Jun 03 16:20:54 2008 +0000
@@ -336,7 +336,7 @@
 
 AVInputFormat smacker_demuxer = {
     "smk",
-    "Smacker Video",
+    NULL_IF_CONFIG_SMALL("Smacker video"),
     sizeof(SmackerContext),
     smacker_probe,
     smacker_read_header,
diff -r 613aff547655 -r 7a0230981402 sol.c
--- a/sol.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/sol.c	Tue Jun 03 16:20:54 2008 +0000
@@ -147,7 +147,7 @@
 
 AVInputFormat sol_demuxer = {
     "sol",
-    "Sierra SOL Format",
+    NULL_IF_CONFIG_SMALL("Sierra SOL format"),
     0,
     sol_probe,
     sol_read_header,
diff -r 613aff547655 -r 7a0230981402 swfdec.c
--- a/swfdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/swfdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -185,7 +185,7 @@
 
 AVInputFormat swf_demuxer = {
     "swf",
-    "Flash format",
+    NULL_IF_CONFIG_SMALL("Flash format"),
     sizeof(SWFContext),
     swf_probe,
     swf_read_header,
diff -r 613aff547655 -r 7a0230981402 swfenc.c
--- a/swfenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/swfenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -503,7 +503,7 @@
 #ifdef CONFIG_SWF_MUXER
 AVOutputFormat swf_muxer = {
     "swf",
-    "Flash format",
+    NULL_IF_CONFIG_SMALL("Flash format"),
     "application/x-shockwave-flash",
     "swf",
     sizeof(SWFContext),
@@ -517,7 +517,7 @@
 #ifdef CONFIG_AVM2_MUXER
 AVOutputFormat avm2_muxer = {
     "avm2",
-    "Flash 9 (AVM2) format",
+    NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"),
     "application/x-shockwave-flash",
     NULL,
     sizeof(SWFContext),
diff -r 613aff547655 -r 7a0230981402 thp.c
--- a/thp.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/thp.c	Tue Jun 03 16:20:54 2008 +0000
@@ -189,7 +189,7 @@
 
 AVInputFormat thp_demuxer = {
     "thp",
-    "THP",
+    NULL_IF_CONFIG_SMALL("THP"),
     sizeof(ThpDemuxContext),
     thp_probe,
     thp_read_header,
diff -r 613aff547655 -r 7a0230981402 tiertexseq.c
--- a/tiertexseq.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/tiertexseq.c	Tue Jun 03 16:20:54 2008 +0000
@@ -304,7 +304,7 @@
 
 AVInputFormat tiertexseq_demuxer = {
     "tiertexseq",
-    "Tiertex Limited SEQ format",
+    NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"),
     sizeof(SeqDemuxContext),
     seq_probe,
     seq_read_header,
diff -r 613aff547655 -r 7a0230981402 tta.c
--- a/tta.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/tta.c	Tue Jun 03 16:20:54 2008 +0000
@@ -139,7 +139,7 @@
 
 AVInputFormat tta_demuxer = {
     "tta",
-    "true-audio",
+    NULL_IF_CONFIG_SMALL("True Audio"),
     sizeof(TTAContext),
     tta_probe,
     tta_read_header,
diff -r 613aff547655 -r 7a0230981402 txd.c
--- a/txd.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/txd.c	Tue Jun 03 16:20:54 2008 +0000
@@ -94,7 +94,7 @@
 AVInputFormat txd_demuxer =
 {
     "txd",
-    "txd format",
+    NULL_IF_CONFIG_SMALL("txd format"),
     0,
     txd_probe,
     txd_read_header,
diff -r 613aff547655 -r 7a0230981402 vc1test.c
--- a/vc1test.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/vc1test.c	Tue Jun 03 16:20:54 2008 +0000
@@ -103,7 +103,7 @@
 
 AVInputFormat vc1t_demuxer = {
     "vc1test",
-    "VC1 test bitstream format",
+    NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"),
     0,
     vc1t_probe,
     vc1t_read_header,
diff -r 613aff547655 -r 7a0230981402 vocdec.c
--- a/vocdec.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/vocdec.c	Tue Jun 03 16:20:54 2008 +0000
@@ -136,7 +136,7 @@
 
 AVInputFormat voc_demuxer = {
     "voc",
-    "Creative Voice File format",
+    NULL_IF_CONFIG_SMALL("Creative Voice file format"),
     sizeof(voc_dec_context_t),
     voc_probe,
     voc_read_header,
diff -r 613aff547655 -r 7a0230981402 vocenc.c
--- a/vocenc.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/vocenc.c	Tue Jun 03 16:20:54 2008 +0000
@@ -90,7 +90,7 @@
 
 AVOutputFormat voc_muxer = {
     "voc",
-    "Creative Voice File format",
+    NULL_IF_CONFIG_SMALL("Creative Voice file format"),
     "audio/x-voc",
     "voc",
     sizeof(voc_enc_context_t),
diff -r 613aff547655 -r 7a0230981402 wav.c
--- a/wav.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/wav.c	Tue Jun 03 16:20:54 2008 +0000
@@ -262,7 +262,7 @@
 #ifdef CONFIG_WAV_DEMUXER
 AVInputFormat wav_demuxer = {
     "wav",
-    "wav format",
+    NULL_IF_CONFIG_SMALL("WAV format"),
     sizeof(WAVContext),
     wav_probe,
     wav_read_header,
@@ -276,7 +276,7 @@
 #ifdef CONFIG_WAV_MUXER
 AVOutputFormat wav_muxer = {
     "wav",
-    "wav format",
+    NULL_IF_CONFIG_SMALL("WAV format"),
     "audio/x-wav",
     "wav",
     sizeof(WAVContext),
diff -r 613aff547655 -r 7a0230981402 wc3movie.c
--- a/wc3movie.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/wc3movie.c	Tue Jun 03 16:20:54 2008 +0000
@@ -385,7 +385,7 @@
 
 AVInputFormat wc3_demuxer = {
     "wc3movie",
-    "Wing Commander III movie format",
+    NULL_IF_CONFIG_SMALL("Wing Commander III movie format"),
     sizeof(Wc3DemuxContext),
     wc3_probe,
     wc3_read_header,
diff -r 613aff547655 -r 7a0230981402 westwood.c
--- a/westwood.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/westwood.c	Tue Jun 03 16:20:54 2008 +0000
@@ -388,7 +388,7 @@
 #ifdef CONFIG_WSAUD_DEMUXER
 AVInputFormat wsaud_demuxer = {
     "wsaud",
-    "Westwood Studios audio format",
+    NULL_IF_CONFIG_SMALL("Westwood Studios audio format"),
     sizeof(WsAudDemuxContext),
     wsaud_probe,
     wsaud_read_header,
@@ -399,7 +399,7 @@
 #ifdef CONFIG_WSVQA_DEMUXER
 AVInputFormat wsvqa_demuxer = {
     "wsvqa",
-    "Westwood Studios VQA format",
+    NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"),
     sizeof(WsVqaDemuxContext),
     wsvqa_probe,
     wsvqa_read_header,
diff -r 613aff547655 -r 7a0230981402 wv.c
--- a/wv.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/wv.c	Tue Jun 03 16:20:54 2008 +0000
@@ -226,7 +226,7 @@
 
 AVInputFormat wv_demuxer = {
     "wv",
-    "WavPack",
+    NULL_IF_CONFIG_SMALL("WavPack"),
     sizeof(WVContext),
     wv_probe,
     wv_read_header,
diff -r 613aff547655 -r 7a0230981402 xa.c
--- a/xa.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/xa.c	Tue Jun 03 16:20:54 2008 +0000
@@ -108,7 +108,7 @@
 
 AVInputFormat xa_demuxer = {
     "xa",
-    "Maxis XA File Format",
+    NULL_IF_CONFIG_SMALL("Maxis XA File Format"),
     sizeof(MaxisXADemuxContext),
     xa_probe,
     xa_read_header,
diff -r 613aff547655 -r 7a0230981402 yuv4mpeg.c
--- a/yuv4mpeg.c	Tue Jun 03 15:19:43 2008 +0000
+++ b/yuv4mpeg.c	Tue Jun 03 16:20:54 2008 +0000
@@ -169,7 +169,7 @@
 #ifdef CONFIG_YUV4MPEGPIPE_MUXER
 AVOutputFormat yuv4mpegpipe_muxer = {
     "yuv4mpegpipe",
-    "YUV4MPEG pipe format",
+    NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
     "",
     "y4m",
     sizeof(int),
@@ -390,7 +390,7 @@
 #ifdef CONFIG_YUV4MPEGPIPE_DEMUXER
 AVInputFormat yuv4mpegpipe_demuxer = {
     "yuv4mpegpipe",
-    "YUV4MPEG pipe format",
+    NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
     sizeof(struct frame_attributes),
     yuv4_probe,
     yuv4_read_header,