[FFmpeg-cvslog] r13649 - in trunk: libavdevice/audio.c libavdevice/bktr.c libavdevice/dv1394.c libavdevice/libdc1394.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/4xm.c libavformat/adtsenc.c libavformat/aiff.c libavformat/amr.c libavformat/apc.c libavformat/ape.c libavformat/asf-enc.c libavformat/asf.c libavformat/au.c libavformat/avformat.h libavformat/avidec.c libavformat/avienc.c libavformat/avisynth.c libavformat/avs.c libavformat/bethsoftvid.c libavformat/bfi.c libavformat/c93.c libavformat/crcenc.c libavformat/daud.c libavformat/dsicin.c libavformat/dv.c libavformat/dvenc.c libavformat/dxa.c libavformat/eacdata.c libavformat/electronicarts.c libavformat/ffmdec.c libavformat/ffmenc.c libavformat/flic.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/gif.c libavformat/gifdec.c libavformat/gxf.c libavformat/gxfenc.c libavformat/idcin.c libavformat/idroq.c libavformat/iff.c libavformat/img2.c libavformat/ipmovie.c libavformat/libnut.c libavformat/lmlm4.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mm.c libavformat/mmf.c libavformat/mov.c libavformat/movenc.c libavformat/mp3.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mpjpeg.c libavformat/msnwc_tcp.c libavformat/mtv.c libavformat/mxf.c libavformat/nsvdec.c libavformat/nutdec.c libavformat/nutenc.c libavformat/nuv.c libavformat/oggdec.c libavformat/oggenc.c libavformat/psxstr.c libavformat/pva.c libavformat/raw.c libavformat/rl2.c libavformat/rmdec.c libavformat/rmenc.c libavformat/rpl.c libavformat/rtpenc.c libavformat/rtsp.c libavformat/segafilm.c libavformat/sierravmd.c libavformat/siff.c libavformat/smacker.c libavformat/sol.c libavformat/swfdec.c libavformat/swfenc.c libavformat/thp.c libavformat/tiertexseq.c libavformat/tta.c libavformat/txd.c libavformat/vc1test.c libavformat/vocdec.c libavformat/vocenc.c libavformat/wav.c libavformat/wc3movie.c libavformat/westwood.c libavformat/wv.c libavformat/xa.c libavformat/yuv4mpeg.c
diego
subversion
Tue Jun 3 18:20:55 CEST 2008
Author: diego
Date: Tue Jun 3 18:20:54 2008
New Revision: 13649
Log:
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
Modified:
trunk/libavdevice/audio.c
trunk/libavdevice/bktr.c
trunk/libavdevice/dv1394.c
trunk/libavdevice/libdc1394.c
trunk/libavdevice/v4l.c
trunk/libavdevice/v4l2.c
trunk/libavdevice/vfwcap.c
trunk/libavdevice/x11grab.c
trunk/libavformat/4xm.c
trunk/libavformat/adtsenc.c
trunk/libavformat/aiff.c
trunk/libavformat/amr.c
trunk/libavformat/apc.c
trunk/libavformat/ape.c
trunk/libavformat/asf-enc.c
trunk/libavformat/asf.c
trunk/libavformat/au.c
trunk/libavformat/avformat.h
trunk/libavformat/avidec.c
trunk/libavformat/avienc.c
trunk/libavformat/avisynth.c
trunk/libavformat/avs.c
trunk/libavformat/bethsoftvid.c
trunk/libavformat/bfi.c
trunk/libavformat/c93.c
trunk/libavformat/crcenc.c
trunk/libavformat/daud.c
trunk/libavformat/dsicin.c
trunk/libavformat/dv.c
trunk/libavformat/dvenc.c
trunk/libavformat/dxa.c
trunk/libavformat/eacdata.c
trunk/libavformat/electronicarts.c
trunk/libavformat/ffmdec.c
trunk/libavformat/ffmenc.c
trunk/libavformat/flic.c
trunk/libavformat/flvdec.c
trunk/libavformat/flvenc.c
trunk/libavformat/framecrcenc.c
trunk/libavformat/gif.c
trunk/libavformat/gifdec.c
trunk/libavformat/gxf.c
trunk/libavformat/gxfenc.c
trunk/libavformat/idcin.c
trunk/libavformat/idroq.c
trunk/libavformat/iff.c
trunk/libavformat/img2.c
trunk/libavformat/ipmovie.c
trunk/libavformat/libnut.c
trunk/libavformat/lmlm4.c
trunk/libavformat/matroskadec.c
trunk/libavformat/matroskaenc.c
trunk/libavformat/mm.c
trunk/libavformat/mmf.c
trunk/libavformat/mov.c
trunk/libavformat/movenc.c
trunk/libavformat/mp3.c
trunk/libavformat/mpc.c
trunk/libavformat/mpc8.c
trunk/libavformat/mpeg.c
trunk/libavformat/mpegenc.c
trunk/libavformat/mpegts.c
trunk/libavformat/mpegtsenc.c
trunk/libavformat/mpjpeg.c
trunk/libavformat/msnwc_tcp.c
trunk/libavformat/mtv.c
trunk/libavformat/mxf.c
trunk/libavformat/nsvdec.c
trunk/libavformat/nutdec.c
trunk/libavformat/nutenc.c
trunk/libavformat/nuv.c
trunk/libavformat/oggdec.c
trunk/libavformat/oggenc.c
trunk/libavformat/psxstr.c
trunk/libavformat/pva.c
trunk/libavformat/raw.c
trunk/libavformat/rl2.c
trunk/libavformat/rmdec.c
trunk/libavformat/rmenc.c
trunk/libavformat/rpl.c
trunk/libavformat/rtpenc.c
trunk/libavformat/rtsp.c
trunk/libavformat/segafilm.c
trunk/libavformat/sierravmd.c
trunk/libavformat/siff.c
trunk/libavformat/smacker.c
trunk/libavformat/sol.c
trunk/libavformat/swfdec.c
trunk/libavformat/swfenc.c
trunk/libavformat/thp.c
trunk/libavformat/tiertexseq.c
trunk/libavformat/tta.c
trunk/libavformat/txd.c
trunk/libavformat/vc1test.c
trunk/libavformat/vocdec.c
trunk/libavformat/vocenc.c
trunk/libavformat/wav.c
trunk/libavformat/wc3movie.c
trunk/libavformat/westwood.c
trunk/libavformat/wv.c
trunk/libavformat/xa.c
trunk/libavformat/yuv4mpeg.c
Modified: trunk/libavdevice/audio.c
==============================================================================
--- trunk/libavdevice/audio.c (original)
+++ trunk/libavdevice/audio.c Tue Jun 3 18:20:54 2008
@@ -315,7 +315,7 @@ static int audio_read_close(AVFormatCont
#ifdef CONFIG_OSS_DEMUXER
AVInputFormat oss_demuxer = {
"oss",
- "audio grab and output",
+ NULL_IF_CONFIG_SMALL("audio grab and output"),
sizeof(AudioData),
NULL,
audio_read_header,
@@ -328,7 +328,7 @@ AVInputFormat oss_demuxer = {
#ifdef CONFIG_OSS_MUXER
AVOutputFormat oss_muxer = {
"oss",
- "audio grab and output",
+ NULL_IF_CONFIG_SMALL("audio grab and output"),
"",
"",
sizeof(AudioData),
Modified: trunk/libavdevice/bktr.c
==============================================================================
--- trunk/libavdevice/bktr.c (original)
+++ trunk/libavdevice/bktr.c Tue Jun 3 18:20:54 2008
@@ -311,7 +311,7 @@ static int grab_read_close(AVFormatConte
AVInputFormat bktr_demuxer = {
"bktr",
- "video grab",
+ NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData),
NULL,
grab_read_header,
Modified: trunk/libavdevice/dv1394.c
==============================================================================
--- trunk/libavdevice/dv1394.c (original)
+++ trunk/libavdevice/dv1394.c Tue Jun 3 18:20:54 2008
@@ -228,7 +228,7 @@ static int dv1394_close(AVFormatContext
AVInputFormat dv1394_demuxer = {
.name = "dv1394",
- .long_name = "dv1394 A/V grab",
+ .long_name = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"),
.priv_data_size = sizeof(struct dv1394_data),
.read_header = dv1394_read_header,
.read_packet = dv1394_read_packet,
Modified: trunk/libavdevice/libdc1394.c
==============================================================================
--- trunk/libavdevice/libdc1394.c (original)
+++ trunk/libavdevice/libdc1394.c Tue Jun 3 18:20:54 2008
@@ -350,7 +350,7 @@ static int dc1394_v2_close(AVFormatConte
AVInputFormat libdc1394_demuxer = {
.name = "libdc1394",
- .long_name = "dc1394 v.2 A/V grab",
+ .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),
.read_header = dc1394_v2_read_header,
.read_packet = dc1394_v2_read_packet,
@@ -362,7 +362,7 @@ AVInputFormat libdc1394_demuxer = {
#if ENABLE_LIBDC1394_1
AVInputFormat libdc1394_demuxer = {
.name = "libdc1394",
- .long_name = "dc1394 v.1 A/V grab",
+ .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),
.priv_data_size = sizeof(struct dc1394_data),
.read_header = dc1394_v1_read_header,
.read_packet = dc1394_v1_read_packet,
Modified: trunk/libavdevice/v4l.c
==============================================================================
--- trunk/libavdevice/v4l.c (original)
+++ trunk/libavdevice/v4l.c Tue Jun 3 18:20:54 2008
@@ -346,7 +346,7 @@ static int grab_read_close(AVFormatConte
AVInputFormat v4l_demuxer = {
"video4linux",
- "video grab",
+ NULL_IF_CONFIG_SMALL("video grab"),
sizeof(VideoData),
NULL,
grab_read_header,
Modified: trunk/libavdevice/v4l2.c
==============================================================================
--- trunk/libavdevice/v4l2.c (original)
+++ trunk/libavdevice/v4l2.c Tue Jun 3 18:20:54 2008
@@ -635,7 +635,7 @@ static int v4l2_read_close(AVFormatConte
AVInputFormat v4l2_demuxer = {
"video4linux2",
- "video grab",
+ NULL_IF_CONFIG_SMALL("video grab"),
sizeof(struct video_data),
NULL,
v4l2_read_header,
Modified: trunk/libavdevice/vfwcap.c
==============================================================================
--- trunk/libavdevice/vfwcap.c (original)
+++ trunk/libavdevice/vfwcap.c Tue Jun 3 18:20:54 2008
@@ -456,7 +456,7 @@ static int vfw_read_close(AVFormatContex
AVInputFormat vfwcap_demuxer = {
"vfwcap",
- "VFW video capture",
+ NULL_IF_CONFIG_SMALL("VFW video capture"),
sizeof(struct vfw_ctx),
NULL,
vfw_read_header,
Modified: trunk/libavdevice/x11grab.c
==============================================================================
--- trunk/libavdevice/x11grab.c (original)
+++ trunk/libavdevice/x11grab.c Tue Jun 3 18:20:54 2008
@@ -519,7 +519,7 @@ x11grab_read_close(AVFormatContext *s1)
AVInputFormat x11_grab_device_demuxer =
{
"x11grab",
- "X11grab",
+ NULL_IF_CONFIG_SMALL("X11grab"),
sizeof(x11_grab_t),
NULL,
x11grab_read_header,
Modified: trunk/libavformat/4xm.c
==============================================================================
--- trunk/libavformat/4xm.c (original)
+++ trunk/libavformat/4xm.c Tue Jun 3 18:20:54 2008
@@ -328,7 +328,7 @@ static int fourxm_read_close(AVFormatCon
AVInputFormat fourxm_demuxer = {
"4xm",
- "4X Technologies format",
+ NULL_IF_CONFIG_SMALL("4X Technologies format"),
sizeof(FourxmDemuxContext),
fourxm_probe,
fourxm_read_header,
Modified: trunk/libavformat/adtsenc.c
==============================================================================
--- trunk/libavformat/adtsenc.c (original)
+++ trunk/libavformat/adtsenc.c Tue Jun 3 18:20:54 2008
@@ -107,7 +107,7 @@ static int adts_write_packet(AVFormatCon
AVOutputFormat adts_muxer = {
"adts",
- "ADTS AAC",
+ NULL_IF_CONFIG_SMALL("ADTS AAC"),
"audio/aac",
"aac",
sizeof(ADTSContext),
Modified: trunk/libavformat/aiff.c
==============================================================================
--- trunk/libavformat/aiff.c (original)
+++ trunk/libavformat/aiff.c Tue Jun 3 18:20:54 2008
@@ -442,7 +442,7 @@ static int aiff_read_seek(AVFormatContex
#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 @@ AVInputFormat aiff_demuxer = {
#ifdef CONFIG_AIFF_MUXER
AVOutputFormat aiff_muxer = {
"aiff",
- "Audio IFF",
+ NULL_IF_CONFIG_SMALL("Audio IFF"),
"audio/aiff",
"aif,aiff,afc,aifc",
sizeof(AIFFOutputContext),
Modified: trunk/libavformat/amr.c
==============================================================================
--- trunk/libavformat/amr.c (original)
+++ trunk/libavformat/amr.c Tue Jun 3 18:20:54 2008
@@ -169,7 +169,7 @@ static int amr_read_packet(AVFormatConte
#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 @@ AVInputFormat amr_demuxer = {
#ifdef CONFIG_AMR_MUXER
AVOutputFormat amr_muxer = {
"amr",
- "3gpp amr file format",
+ NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
"audio/amr",
"amr",
0,
Modified: trunk/libavformat/apc.c
==============================================================================
--- trunk/libavformat/apc.c (original)
+++ trunk/libavformat/apc.c Tue Jun 3 18:20:54 2008
@@ -82,7 +82,7 @@ static int apc_read_packet(AVFormatConte
AVInputFormat apc_demuxer = {
"apc",
- "CRYO APC format",
+ NULL_IF_CONFIG_SMALL("CRYO APC format"),
0,
apc_probe,
apc_read_header,
Modified: trunk/libavformat/ape.c
==============================================================================
--- trunk/libavformat/ape.c (original)
+++ trunk/libavformat/ape.c Tue Jun 3 18:20:54 2008
@@ -511,7 +511,7 @@ static int ape_read_seek(AVFormatContext
AVInputFormat ape_demuxer = {
"ape",
- "Monkey's Audio",
+ NULL_IF_CONFIG_SMALL("Monkey's Audio"),
sizeof(APEContext),
ape_probe,
ape_read_header,
Modified: trunk/libavformat/asf-enc.c
==============================================================================
--- trunk/libavformat/asf-enc.c (original)
+++ trunk/libavformat/asf-enc.c Tue Jun 3 18:20:54 2008
@@ -815,7 +815,7 @@ static int asf_write_trailer(AVFormatCon
#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 @@ AVOutputFormat asf_muxer = {
#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),
Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c (original)
+++ trunk/libavformat/asf.c Tue Jun 3 18:20:54 2008
@@ -1094,7 +1094,7 @@ static int asf_read_seek(AVFormatContext
AVInputFormat asf_demuxer = {
"asf",
- "asf format",
+ NULL_IF_CONFIG_SMALL("ASF format"),
sizeof(ASFContext),
asf_probe,
asf_read_header,
Modified: trunk/libavformat/au.c
==============================================================================
--- trunk/libavformat/au.c (original)
+++ trunk/libavformat/au.c Tue Jun 3 18:20:54 2008
@@ -180,7 +180,7 @@ static int au_read_close(AVFormatContext
#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 @@ AVInputFormat au_demuxer = {
#ifdef CONFIG_AU_MUXER
AVOutputFormat au_muxer = {
"au",
- "SUN AU Format",
+ NULL_IF_CONFIG_SMALL("SUN AU format"),
"audio/basic",
"au",
0,
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h (original)
+++ trunk/libavformat/avformat.h Tue Jun 3 18:20:54 2008
@@ -185,6 +185,11 @@ typedef struct AVFormatParameters {
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 AVOutputFormat {
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;
Modified: trunk/libavformat/avidec.c
==============================================================================
--- trunk/libavformat/avidec.c (original)
+++ trunk/libavformat/avidec.c Tue Jun 3 18:20:54 2008
@@ -1087,7 +1087,7 @@ static int avi_probe(AVProbeData *p)
AVInputFormat avi_demuxer = {
"avi",
- "avi format",
+ NULL_IF_CONFIG_SMALL("AVI format"),
sizeof(AVIContext),
avi_probe,
avi_read_header,
Modified: trunk/libavformat/avienc.c
==============================================================================
--- trunk/libavformat/avienc.c (original)
+++ trunk/libavformat/avienc.c Tue Jun 3 18:20:54 2008
@@ -593,7 +593,7 @@ static int avi_write_trailer(AVFormatCon
AVOutputFormat avi_muxer = {
"avi",
- "avi format",
+ NULL_IF_CONFIG_SMALL("AVI format"),
"video/x-msvideo",
"avi",
sizeof(AVIContext),
Modified: trunk/libavformat/avisynth.c
==============================================================================
--- trunk/libavformat/avisynth.c (original)
+++ trunk/libavformat/avisynth.c Tue Jun 3 18:20:54 2008
@@ -209,7 +209,7 @@ static int avisynth_read_seek(AVFormatCo
AVInputFormat avisynth_demuxer = {
"avs",
- "AVISynth",
+ NULL_IF_CONFIG_SMALL("AVISynth"),
sizeof(AVISynthContext),
NULL,
avisynth_read_header,
Modified: trunk/libavformat/avs.c
==============================================================================
--- trunk/libavformat/avs.c (original)
+++ trunk/libavformat/avs.c Tue Jun 3 18:20:54 2008
@@ -217,7 +217,7 @@ static int avs_read_close(AVFormatContex
AVInputFormat avs_demuxer = {
"avs",
- "avs format",
+ NULL_IF_CONFIG_SMALL("AVS format"),
sizeof(avs_format_t),
avs_probe,
avs_read_header,
Modified: trunk/libavformat/bethsoftvid.c
==============================================================================
--- trunk/libavformat/bethsoftvid.c (original)
+++ trunk/libavformat/bethsoftvid.c Tue Jun 3 18:20:54 2008
@@ -225,7 +225,7 @@ static int vid_read_packet(AVFormatConte
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,
Modified: trunk/libavformat/bfi.c
==============================================================================
--- trunk/libavformat/bfi.c (original)
+++ trunk/libavformat/bfi.c Tue Jun 3 18:20:54 2008
@@ -159,7 +159,7 @@ static int bfi_read_packet(AVFormatConte
AVInputFormat bfi_demuxer = {
"bfi",
- "Brute Force & Ignorance",
+ NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"),
sizeof(BFIContext),
bfi_probe,
bfi_read_header,
Modified: trunk/libavformat/c93.c
==============================================================================
--- trunk/libavformat/c93.c (original)
+++ trunk/libavformat/c93.c Tue Jun 3 18:20:54 2008
@@ -190,7 +190,7 @@ static int read_packet(AVFormatContext *
AVInputFormat c93_demuxer = {
"c93",
- "Interplay C93",
+ NULL_IF_CONFIG_SMALL("Interplay C93"),
sizeof(C93DemuxContext),
probe,
read_header,
Modified: trunk/libavformat/crcenc.c
==============================================================================
--- trunk/libavformat/crcenc.c (original)
+++ trunk/libavformat/crcenc.c Tue Jun 3 18:20:54 2008
@@ -56,7 +56,7 @@ static int crc_write_trailer(struct AVFo
AVOutputFormat crc_muxer = {
"crc",
- "crc testing format",
+ NULL_IF_CONFIG_SMALL("CRC testing format"),
NULL,
"",
sizeof(CRCState),
Modified: trunk/libavformat/daud.c
==============================================================================
--- trunk/libavformat/daud.c (original)
+++ trunk/libavformat/daud.c Tue Jun 3 18:20:54 2008
@@ -49,7 +49,7 @@ static int daud_packet(AVFormatContext *
AVInputFormat daud_demuxer = {
"daud",
- "D-Cinema audio format",
+ NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
0,
NULL,
daud_header,
Modified: trunk/libavformat/dsicin.c
==============================================================================
--- trunk/libavformat/dsicin.c (original)
+++ trunk/libavformat/dsicin.c Tue Jun 3 18:20:54 2008
@@ -213,7 +213,7 @@ static int cin_read_packet(AVFormatConte
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,
Modified: trunk/libavformat/dv.c
==============================================================================
--- trunk/libavformat/dv.c (original)
+++ trunk/libavformat/dv.c Tue Jun 3 18:20:54 2008
@@ -440,7 +440,7 @@ static int dv_read_close(AVFormatContext
#ifdef CONFIG_DV_DEMUXER
AVInputFormat dv_demuxer = {
"dv",
- "DV video format",
+ NULL_IF_CONFIG_SMALL("DV video format"),
sizeof(RawDVContext),
NULL,
dv_read_header,
Modified: trunk/libavformat/dvenc.c
==============================================================================
--- trunk/libavformat/dvenc.c (original)
+++ trunk/libavformat/dvenc.c Tue Jun 3 18:20:54 2008
@@ -402,7 +402,7 @@ static int dv_write_trailer(struct AVFor
#ifdef CONFIG_DV_MUXER
AVOutputFormat dv_muxer = {
"dv",
- "DV video format",
+ NULL_IF_CONFIG_SMALL("DV video format"),
NULL,
"dv",
sizeof(DVMuxContext),
Modified: trunk/libavformat/dxa.c
==============================================================================
--- trunk/libavformat/dxa.c (original)
+++ trunk/libavformat/dxa.c Tue Jun 3 18:20:54 2008
@@ -204,7 +204,7 @@ static int dxa_read_packet(AVFormatConte
AVInputFormat dxa_demuxer = {
"dxa",
- "dxa",
+ NULL_IF_CONFIG_SMALL("DXA"),
sizeof(DXAContext),
dxa_probe,
dxa_read_header,
Modified: trunk/libavformat/eacdata.c
==============================================================================
--- trunk/libavformat/eacdata.c (original)
+++ trunk/libavformat/eacdata.c Tue Jun 3 18:20:54 2008
@@ -91,7 +91,7 @@ static int cdata_read_packet(AVFormatCon
AVInputFormat ea_cdata_demuxer = {
"ea_cdata",
- "Electronic Arts cdata",
+ NULL_IF_CONFIG_SMALL("Electronic Arts cdata"),
sizeof(CdataDemuxContext),
cdata_probe,
cdata_read_header,
Modified: trunk/libavformat/electronicarts.c
==============================================================================
--- trunk/libavformat/electronicarts.c (original)
+++ trunk/libavformat/electronicarts.c Tue Jun 3 18:20:54 2008
@@ -465,7 +465,7 @@ static int ea_read_packet(AVFormatContex
AVInputFormat ea_demuxer = {
"ea",
- "Electronic Arts Multimedia Format",
+ NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"),
sizeof(EaDemuxContext),
ea_probe,
ea_read_header,
Modified: trunk/libavformat/ffmdec.c
==============================================================================
--- trunk/libavformat/ffmdec.c (original)
+++ trunk/libavformat/ffmdec.c Tue Jun 3 18:20:54 2008
@@ -480,7 +480,7 @@ static int ffm_probe(AVProbeData *p)
AVInputFormat ffm_demuxer = {
"ffm",
- "ffm format",
+ NULL_IF_CONFIG_SMALL("ffm format"),
sizeof(FFMContext),
ffm_probe,
ffm_read_header,
Modified: trunk/libavformat/ffmenc.c
==============================================================================
--- trunk/libavformat/ffmenc.c (original)
+++ trunk/libavformat/ffmenc.c Tue Jun 3 18:20:54 2008
@@ -253,7 +253,7 @@ static int ffm_write_trailer(AVFormatCon
AVOutputFormat ffm_muxer = {
"ffm",
- "ffm format",
+ NULL_IF_CONFIG_SMALL("ffm format"),
"",
"ffm",
sizeof(FFMContext),
Modified: trunk/libavformat/flic.c
==============================================================================
--- trunk/libavformat/flic.c (original)
+++ trunk/libavformat/flic.c Tue Jun 3 18:20:54 2008
@@ -194,7 +194,7 @@ static int flic_read_close(AVFormatConte
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,
Modified: trunk/libavformat/flvdec.c
==============================================================================
--- trunk/libavformat/flvdec.c (original)
+++ trunk/libavformat/flvdec.c Tue Jun 3 18:20:54 2008
@@ -419,7 +419,7 @@ static int flv_read_packet(AVFormatConte
AVInputFormat flv_demuxer = {
"flv",
- "flv format",
+ NULL_IF_CONFIG_SMALL("FLV format"),
0,
flv_probe,
flv_read_header,
Modified: trunk/libavformat/flvenc.c
==============================================================================
--- trunk/libavformat/flvenc.c (original)
+++ trunk/libavformat/flvenc.c Tue Jun 3 18:20:54 2008
@@ -374,7 +374,7 @@ static int flv_write_packet(AVFormatCont
AVOutputFormat flv_muxer = {
"flv",
- "flv format",
+ NULL_IF_CONFIG_SMALL("FLV format"),
"video/x-flv",
"flv",
sizeof(FLVContext),
Modified: trunk/libavformat/framecrcenc.c
==============================================================================
--- trunk/libavformat/framecrcenc.c (original)
+++ trunk/libavformat/framecrcenc.c Tue Jun 3 18:20:54 2008
@@ -35,7 +35,7 @@ static int framecrc_write_packet(struct
AVOutputFormat framecrc_muxer = {
"framecrc",
- "framecrc testing format",
+ NULL_IF_CONFIG_SMALL("framecrc testing format"),
NULL,
"",
0,
Modified: trunk/libavformat/gif.c
==============================================================================
--- trunk/libavformat/gif.c (original)
+++ trunk/libavformat/gif.c Tue Jun 3 18:20:54 2008
@@ -407,7 +407,7 @@ static int gif_write_trailer(AVFormatCon
AVOutputFormat gif_muxer = {
"gif",
- "GIF Animation",
+ NULL_IF_CONFIG_SMALL("GIF Animation"),
"image/gif",
"gif",
sizeof(GIFContext),
Modified: trunk/libavformat/gifdec.c
==============================================================================
--- trunk/libavformat/gifdec.c (original)
+++ trunk/libavformat/gifdec.c Tue Jun 3 18:20:54 2008
@@ -581,7 +581,7 @@ static int gif_read_close(AVFormatContex
AVInputFormat gif_demuxer =
{
"gif",
- "gif format",
+ NULL_IF_CONFIG_SMALL("GIF format"),
sizeof(GifState),
gif_video_probe,
gif_read_header,
Modified: trunk/libavformat/gxf.c
==============================================================================
--- trunk/libavformat/gxf.c (original)
+++ trunk/libavformat/gxf.c Tue Jun 3 18:20:54 2008
@@ -492,7 +492,7 @@ static int64_t gxf_read_timestamp(AVForm
AVInputFormat gxf_demuxer = {
"gxf",
- "GXF format",
+ NULL_IF_CONFIG_SMALL("GXF format"),
0,
gxf_probe,
gxf_header,
Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c (original)
+++ trunk/libavformat/gxfenc.c Tue Jun 3 18:20:54 2008
@@ -813,7 +813,7 @@ static int gxf_interleave_packet(AVForma
AVOutputFormat gxf_muxer = {
"gxf",
- "GXF format",
+ NULL_IF_CONFIG_SMALL("GXF format"),
NULL,
"gxf",
sizeof(GXFContext),
Modified: trunk/libavformat/idcin.c
==============================================================================
--- trunk/libavformat/idcin.c (original)
+++ trunk/libavformat/idcin.c Tue Jun 3 18:20:54 2008
@@ -288,7 +288,7 @@ static int idcin_read_close(AVFormatCont
AVInputFormat idcin_demuxer = {
"idcin",
- "Id CIN format",
+ NULL_IF_CONFIG_SMALL("Id CIN format"),
sizeof(IdcinDemuxContext),
idcin_probe,
idcin_read_header,
Modified: trunk/libavformat/idroq.c
==============================================================================
--- trunk/libavformat/idroq.c (original)
+++ trunk/libavformat/idroq.c Tue Jun 3 18:20:54 2008
@@ -279,7 +279,7 @@ static int roq_read_close(AVFormatContex
AVInputFormat roq_demuxer = {
"RoQ",
- "Id RoQ format",
+ NULL_IF_CONFIG_SMALL("Id RoQ format"),
sizeof(RoqDemuxContext),
roq_probe,
roq_read_header,
Modified: trunk/libavformat/iff.c
==============================================================================
--- trunk/libavformat/iff.c (original)
+++ trunk/libavformat/iff.c Tue Jun 3 18:20:54 2008
@@ -192,7 +192,7 @@ static int iff_read_packet(AVFormatConte
AVInputFormat iff_demuxer = {
"IFF",
- "IFF format",
+ NULL_IF_CONFIG_SMALL("IFF format"),
sizeof(IffDemuxContext),
iff_probe,
iff_read_header,
Modified: trunk/libavformat/img2.c
==============================================================================
--- trunk/libavformat/img2.c (original)
+++ trunk/libavformat/img2.c Tue Jun 3 18:20:54 2008
@@ -379,7 +379,7 @@ static int img_write_packet(AVFormatCont
#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 @@ AVInputFormat image2_demuxer = {
#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 @@ AVInputFormat image2pipe_demuxer = {
#ifdef CONFIG_IMAGE2_MUXER
AVOutputFormat image2_muxer = {
"image2",
- "image2 sequence",
+ NULL_IF_CONFIG_SMALL("image2 sequence"),
"",
"",
sizeof(VideoData),
@@ -422,7 +422,7 @@ AVOutputFormat image2_muxer = {
#ifdef CONFIG_IMAGE2PIPE_MUXER
AVOutputFormat image2pipe_muxer = {
"image2pipe",
- "piped image2 sequence",
+ NULL_IF_CONFIG_SMALL("piped image2 sequence"),
"",
"",
sizeof(VideoData),
Modified: trunk/libavformat/ipmovie.c
==============================================================================
--- trunk/libavformat/ipmovie.c (original)
+++ trunk/libavformat/ipmovie.c Tue Jun 3 18:20:54 2008
@@ -616,7 +616,7 @@ static int ipmovie_read_close(AVFormatCo
AVInputFormat ipmovie_demuxer = {
"ipmovie",
- "Interplay MVE format",
+ NULL_IF_CONFIG_SMALL("Interplay MVE format"),
sizeof(IPMVEContext),
ipmovie_probe,
ipmovie_read_header,
Modified: trunk/libavformat/libnut.c
==============================================================================
--- trunk/libavformat/libnut.c (original)
+++ trunk/libavformat/libnut.c Tue Jun 3 18:20:54 2008
@@ -299,7 +299,7 @@ static int nut_read_close(AVFormatContex
AVInputFormat libnut_demuxer = {
"libnut",
- "nut format",
+ NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext),
nut_probe,
nut_read_header,
Modified: trunk/libavformat/lmlm4.c
==============================================================================
--- trunk/libavformat/lmlm4.c (original)
+++ trunk/libavformat/lmlm4.c Tue Jun 3 18:20:54 2008
@@ -118,7 +118,7 @@ static int lmlm4_read_packet(AVFormatCon
AVInputFormat lmlm4_demuxer = {
"lmlm4",
- "lmlm4 raw format",
+ NULL_IF_CONFIG_SMALL("lmlm4 raw format"),
0,
lmlm4_probe,
lmlm4_read_header,
Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c (original)
+++ trunk/libavformat/matroskadec.c Tue Jun 3 18:20:54 2008
@@ -3248,7 +3248,7 @@ matroska_read_close (AVFormatContext *s)
AVInputFormat matroska_demuxer = {
"matroska",
- "Matroska file format",
+ NULL_IF_CONFIG_SMALL("Matroska file format"),
sizeof(MatroskaDemuxContext),
matroska_probe,
matroska_read_header,
Modified: trunk/libavformat/matroskaenc.c
==============================================================================
--- trunk/libavformat/matroskaenc.c (original)
+++ trunk/libavformat/matroskaenc.c Tue Jun 3 18:20:54 2008
@@ -819,7 +819,7 @@ static int mkv_write_trailer(AVFormatCon
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_muxer = {
AVOutputFormat matroska_audio_muxer = {
"matroska",
- "Matroska File Format",
+ NULL_IF_CONFIG_SMALL("Matroska file format"),
"audio/x-matroska",
"mka",
sizeof(MatroskaMuxContext),
Modified: trunk/libavformat/mm.c
==============================================================================
--- trunk/libavformat/mm.c (original)
+++ trunk/libavformat/mm.c Tue Jun 3 18:20:54 2008
@@ -201,7 +201,7 @@ static int mm_read_close(AVFormatContext
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,
Modified: trunk/libavformat/mmf.c
==============================================================================
--- trunk/libavformat/mmf.c (original)
+++ trunk/libavformat/mmf.c Tue Jun 3 18:20:54 2008
@@ -304,7 +304,7 @@ static int mmf_read_seek(AVFormatContext
#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 @@ AVInputFormat mmf_demuxer = {
#ifdef CONFIG_MMF_MUXER
AVOutputFormat mmf_muxer = {
"mmf",
- "mmf format",
+ NULL_IF_CONFIG_SMALL("mmf format"),
"application/vnd.smaf",
"mmf",
sizeof(MMFContext),
Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c (original)
+++ trunk/libavformat/mov.c Tue Jun 3 18:20:54 2008
@@ -1914,7 +1914,7 @@ static int mov_read_close(AVFormatContex
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,
Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c (original)
+++ trunk/libavformat/movenc.c Tue Jun 3 18:20:54 2008
@@ -1666,7 +1666,7 @@ static int mov_write_trailer(AVFormatCon
#ifdef CONFIG_MOV_MUXER
AVOutputFormat mov_muxer = {
"mov",
- "mov format",
+ NULL_IF_CONFIG_SMALL("MOV format"),
NULL,
"mov",
sizeof(MOVContext),
@@ -1682,7 +1682,7 @@ AVOutputFormat mov_muxer = {
#ifdef CONFIG_TGP_MUXER
AVOutputFormat tgp_muxer = {
"3gp",
- "3gp format",
+ NULL_IF_CONFIG_SMALL("3GP format"),
NULL,
"3gp",
sizeof(MOVContext),
@@ -1698,7 +1698,7 @@ AVOutputFormat tgp_muxer = {
#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 @@ AVOutputFormat mp4_muxer = {
#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 @@ AVOutputFormat psp_muxer = {
#ifdef CONFIG_TG2_MUXER
AVOutputFormat tg2_muxer = {
"3g2",
- "3gp2 format",
+ NULL_IF_CONFIG_SMALL("3GP2 format"),
NULL,
"3g2",
sizeof(MOVContext),
@@ -1746,7 +1746,7 @@ AVOutputFormat tg2_muxer = {
#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),
Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c (original)
+++ trunk/libavformat/mp3.c Tue Jun 3 18:20:54 2008
@@ -646,7 +646,7 @@ static int mp3_write_trailer(struct AVFo
#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 @@ AVInputFormat mp3_demuxer = {
#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 @@ AVOutputFormat mp2_muxer = {
#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,
Modified: trunk/libavformat/mpc.c
==============================================================================
--- trunk/libavformat/mpc.c (original)
+++ trunk/libavformat/mpc.c Tue Jun 3 18:20:54 2008
@@ -219,7 +219,7 @@ static int mpc_read_seek(AVFormatContext
AVInputFormat mpc_demuxer = {
"mpc",
- "musepack",
+ NULL_IF_CONFIG_SMALL("Musepack"),
sizeof(MPCContext),
mpc_probe,
mpc_read_header,
Modified: trunk/libavformat/mpc8.c
==============================================================================
--- trunk/libavformat/mpc8.c (original)
+++ trunk/libavformat/mpc8.c Tue Jun 3 18:20:54 2008
@@ -235,7 +235,7 @@ static int mpc8_read_seek(AVFormatContex
AVInputFormat mpc8_demuxer = {
"mpc8",
- "musepack8",
+ NULL_IF_CONFIG_SMALL("Musepack SV8"),
sizeof(MPCContext),
mpc8_probe,
mpc8_read_header,
Modified: trunk/libavformat/mpeg.c
==============================================================================
--- trunk/libavformat/mpeg.c (original)
+++ trunk/libavformat/mpeg.c Tue Jun 3 18:20:54 2008
@@ -583,7 +583,7 @@ static int64_t mpegps_read_dts(AVFormatC
AVInputFormat mpegps_demuxer = {
"mpeg",
- "MPEG PS format",
+ NULL_IF_CONFIG_SMALL("MPEG-PS format"),
sizeof(MpegDemuxContext),
mpegps_probe,
mpegps_read_header,
Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c (original)
+++ trunk/libavformat/mpegenc.c Tue Jun 3 18:20:54 2008
@@ -1221,7 +1221,7 @@ static int mpeg_mux_end(AVFormatContext
#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 @@ AVOutputFormat mpeg1system_muxer = {
#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 @@ AVOutputFormat mpeg1vcd_muxer = {
#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 @@ AVOutputFormat mpeg2vob_muxer = {
#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 @@ AVOutputFormat mpeg2svcd_muxer = {
#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),
Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c (original)
+++ trunk/libavformat/mpegts.c Tue Jun 3 18:20:54 2008
@@ -1499,7 +1499,7 @@ void mpegts_parse_close(MpegTSContext *t
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 mpegts_demuxer = {
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,
Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c (original)
+++ trunk/libavformat/mpegtsenc.c Tue Jun 3 18:20:54 2008
@@ -684,7 +684,7 @@ static int mpegts_write_end(AVFormatCont
AVOutputFormat mpegts_muxer = {
"mpegts",
- "MPEG2 transport stream format",
+ NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
"video/x-mpegts",
"ts,m2t",
sizeof(MpegTSWrite),
Modified: trunk/libavformat/mpjpeg.c
==============================================================================
--- trunk/libavformat/mpjpeg.c (original)
+++ trunk/libavformat/mpjpeg.c Tue Jun 3 18:20:54 2008
@@ -55,7 +55,7 @@ static int mpjpeg_write_trailer(AVFormat
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,
Modified: trunk/libavformat/msnwc_tcp.c
==============================================================================
--- trunk/libavformat/msnwc_tcp.c (original)
+++ trunk/libavformat/msnwc_tcp.c Tue Jun 3 18:20:54 2008
@@ -132,7 +132,7 @@ static int msnwc_tcp_read_packet(AVForma
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,
Modified: trunk/libavformat/mtv.c
==============================================================================
--- trunk/libavformat/mtv.c (original)
+++ trunk/libavformat/mtv.c Tue Jun 3 18:20:54 2008
@@ -176,7 +176,7 @@ static int mtv_read_packet(AVFormatConte
AVInputFormat mtv_demuxer = {
"MTV",
- "MTV format",
+ NULL_IF_CONFIG_SMALL("MTV format"),
sizeof(MTVDemuxContext),
mtv_probe,
mtv_read_header,
Modified: trunk/libavformat/mxf.c
==============================================================================
--- trunk/libavformat/mxf.c (original)
+++ trunk/libavformat/mxf.c Tue Jun 3 18:20:54 2008
@@ -1061,7 +1061,7 @@ static int mxf_read_seek(AVFormatContext
AVInputFormat mxf_demuxer = {
"mxf",
- "MXF format",
+ NULL_IF_CONFIG_SMALL("MXF format"),
sizeof(MXFContext),
mxf_probe,
mxf_read_header,
Modified: trunk/libavformat/nsvdec.c
==============================================================================
--- trunk/libavformat/nsvdec.c (original)
+++ trunk/libavformat/nsvdec.c Tue Jun 3 18:20:54 2008
@@ -751,7 +751,7 @@ static int nsv_probe(AVProbeData *p)
AVInputFormat nsv_demuxer = {
"nsv",
- "NullSoft Video format",
+ NULL_IF_CONFIG_SMALL("NullSoft Video format"),
sizeof(NSVContext),
nsv_probe,
nsv_read_header,
Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c (original)
+++ trunk/libavformat/nutdec.c Tue Jun 3 18:20:54 2008
@@ -908,7 +908,7 @@ static int nut_read_close(AVFormatContex
#ifdef CONFIG_NUT_DEMUXER
AVInputFormat nut_demuxer = {
"nut",
- "nut format",
+ NULL_IF_CONFIG_SMALL("NUT format"),
sizeof(NUTContext),
nut_probe,
nut_read_header,
Modified: trunk/libavformat/nutenc.c
==============================================================================
--- trunk/libavformat/nutenc.c (original)
+++ trunk/libavformat/nutenc.c Tue Jun 3 18:20:54 2008
@@ -802,7 +802,7 @@ static int write_trailer(AVFormatContext
AVOutputFormat nut_muxer = {
"nut",
- "nut format",
+ NULL_IF_CONFIG_SMALL("NUT format"),
"video/x-nut",
"nut",
sizeof(NUTContext),
Modified: trunk/libavformat/nuv.c
==============================================================================
--- trunk/libavformat/nuv.c (original)
+++ trunk/libavformat/nuv.c Tue Jun 3 18:20:54 2008
@@ -242,7 +242,7 @@ static int nuv_packet(AVFormatContext *s
AVInputFormat nuv_demuxer = {
"nuv",
- "NuppelVideo format",
+ NULL_IF_CONFIG_SMALL("NuppelVideo format"),
sizeof(NUVContext),
nuv_probe,
nuv_header,
Modified: trunk/libavformat/oggdec.c
==============================================================================
--- trunk/libavformat/oggdec.c (original)
+++ trunk/libavformat/oggdec.c Tue Jun 3 18:20:54 2008
@@ -584,7 +584,7 @@ static int ogg_probe(AVProbeData *p)
AVInputFormat ogg_demuxer = {
"ogg",
- "Ogg",
+ NULL_IF_CONFIG_SMALL("Ogg"),
sizeof (ogg_t),
ogg_probe,
ogg_read_header,
Modified: trunk/libavformat/oggenc.c
==============================================================================
--- trunk/libavformat/oggenc.c (original)
+++ trunk/libavformat/oggenc.c Tue Jun 3 18:20:54 2008
@@ -279,7 +279,7 @@ static int ogg_write_trailer(AVFormatCon
AVOutputFormat ogg_muxer = {
"ogg",
- "Ogg format",
+ NULL_IF_CONFIG_SMALL("Ogg"),
"application/ogg",
"ogg",
0,
Modified: trunk/libavformat/psxstr.c
==============================================================================
--- trunk/libavformat/psxstr.c (original)
+++ trunk/libavformat/psxstr.c Tue Jun 3 18:20:54 2008
@@ -351,7 +351,7 @@ static int str_read_close(AVFormatContex
AVInputFormat str_demuxer = {
"psxstr",
- "Sony Playstation STR format",
+ NULL_IF_CONFIG_SMALL("Sony Playstation STR format"),
sizeof(StrDemuxContext),
str_probe,
str_read_header,
Modified: trunk/libavformat/pva.c
==============================================================================
--- trunk/libavformat/pva.c (original)
+++ trunk/libavformat/pva.c Tue Jun 3 18:20:54 2008
@@ -202,7 +202,7 @@ static int64_t pva_read_timestamp(struct
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,
Modified: trunk/libavformat/raw.c
==============================================================================
--- trunk/libavformat/raw.c (original)
+++ trunk/libavformat/raw.c Tue Jun 3 18:20:54 2008
@@ -431,7 +431,7 @@ static int flac_probe(AVProbeData *p)
AVInputFormat shorten_demuxer = {
"shn",
- "raw shorten",
+ NULL_IF_CONFIG_SMALL("raw Shorten"),
0,
NULL,
audio_read_header,
@@ -444,7 +444,7 @@ AVInputFormat shorten_demuxer = {
AVInputFormat mlp_demuxer = {
"mlp",
- "raw mlp",
+ NULL_IF_CONFIG_SMALL("raw MLP"),
0,
NULL,
audio_read_header,
@@ -457,7 +457,7 @@ AVInputFormat mlp_demuxer = {
AVInputFormat flac_demuxer = {
"flac",
- "raw flac",
+ NULL_IF_CONFIG_SMALL("raw FLAC"),
0,
flac_probe,
audio_read_header,
@@ -471,7 +471,7 @@ AVInputFormat flac_demuxer = {
#ifdef CONFIG_MUXERS
AVOutputFormat flac_muxer = {
"flac",
- "raw flac",
+ NULL_IF_CONFIG_SMALL("raw FLAC"),
"audio/x-flac",
"flac",
0,
@@ -486,7 +486,7 @@ AVOutputFormat flac_muxer = {
#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 @@ AVInputFormat ac3_demuxer = {
#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 ac3_muxer = {
AVOutputFormat dts_muxer = {
"dts",
- "raw dts",
+ NULL_IF_CONFIG_SMALL("raw DTS"),
"audio/x-dca",
"dts",
0,
@@ -529,7 +529,7 @@ AVOutputFormat dts_muxer = {
AVInputFormat dirac_demuxer = {
"dirac",
- "raw dirac",
+ NULL_IF_CONFIG_SMALL("raw Dirac"),
0,
dirac_probe,
video_read_header,
@@ -542,7 +542,7 @@ AVInputFormat dirac_demuxer = {
#ifdef CONFIG_MUXERS
AVOutputFormat dirac_muxer = {
"dirac",
- "raw dirac",
+ NULL_IF_CONFIG_SMALL("raw Dirac"),
NULL,
"drc",
0,
@@ -556,7 +556,7 @@ AVOutputFormat dirac_muxer = {
AVInputFormat dts_demuxer = {
"dts",
- "raw dts",
+ NULL_IF_CONFIG_SMALL("raw DTS"),
0,
dts_probe,
audio_read_header,
@@ -569,7 +569,7 @@ AVInputFormat dts_demuxer = {
AVInputFormat aac_demuxer = {
"aac",
- "ADTS AAC",
+ NULL_IF_CONFIG_SMALL("ADTS AAC"),
0,
NULL,
audio_read_header,
@@ -582,7 +582,7 @@ AVInputFormat aac_demuxer = {
AVInputFormat gsm_demuxer = {
"gsm",
- "GSM",
+ NULL_IF_CONFIG_SMALL("GSM"),
0,
NULL,
audio_read_header,
@@ -597,7 +597,7 @@ AVInputFormat gsm_demuxer = {
AVOutputFormat roq_muxer =
{
"RoQ",
- "Id RoQ format",
+ NULL_IF_CONFIG_SMALL("Id RoQ format"),
NULL,
"roq",
0,
@@ -610,7 +610,7 @@ AVOutputFormat roq_muxer =
AVInputFormat h261_demuxer = {
"h261",
- "raw h261",
+ NULL_IF_CONFIG_SMALL("raw H.261"),
0,
h261_probe,
video_read_header,
@@ -624,7 +624,7 @@ AVInputFormat h261_demuxer = {
#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 @@ AVOutputFormat h261_muxer = {
AVInputFormat h263_demuxer = {
"h263",
- "raw h263",
+ NULL_IF_CONFIG_SMALL("raw H.263"),
0,
h263_probe,
video_read_header,
@@ -652,7 +652,7 @@ AVInputFormat h263_demuxer = {
#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 @@ AVOutputFormat h263_muxer = {
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 @@ AVInputFormat m4v_demuxer = {
#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 @@ AVOutputFormat m4v_muxer = {
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 @@ AVInputFormat h264_demuxer = {
#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 @@ AVOutputFormat h264_muxer = {
AVInputFormat mpegvideo_demuxer = {
"mpegvideo",
- "MPEG video",
+ NULL_IF_CONFIG_SMALL("MPEG video"),
0,
mpegvideo_probe,
video_read_header,
@@ -735,7 +735,7 @@ AVInputFormat mpegvideo_demuxer = {
#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 @@ AVOutputFormat mpeg1video_muxer = {
#ifdef CONFIG_MUXERS
AVOutputFormat mpeg2video_muxer = {
"mpeg2video",
- "MPEG2 video",
+ NULL_IF_CONFIG_SMALL("MPEG-2 video"),
NULL,
"m2v",
0,
@@ -764,7 +764,7 @@ AVOutputFormat mpeg2video_muxer = {
AVInputFormat mjpeg_demuxer = {
"mjpeg",
- "MJPEG video",
+ NULL_IF_CONFIG_SMALL("MJPEG video"),
0,
NULL,
video_read_header,
@@ -777,7 +777,7 @@ AVInputFormat mjpeg_demuxer = {
AVInputFormat ingenient_demuxer = {
"ingenient",
- "Ingenient MJPEG",
+ NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
0,
NULL,
video_read_header,
@@ -791,7 +791,7 @@ AVInputFormat ingenient_demuxer = {
#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 @@ AVOutputFormat mjpeg_muxer = {
AVInputFormat vc1_demuxer = {
"vc1",
- "raw vc1",
+ NULL_IF_CONFIG_SMALL("raw VC-1"),
0,
NULL /* vc1_probe */,
video_read_header,
@@ -820,7 +820,7 @@ AVInputFormat vc1_demuxer = {
#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 @@ AVInputFormat pcm_ ## name ## _demuxer =
#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 @@ static int rawvideo_read_packet(AVFormat
AVInputFormat rawvideo_demuxer = {
"rawvideo",
- "raw video format",
+ NULL_IF_CONFIG_SMALL("raw video format"),
0,
NULL,
raw_read_header,
@@ -934,7 +934,7 @@ AVInputFormat rawvideo_demuxer = {
#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 @@ static int null_write_packet(struct AVFo
AVOutputFormat null_muxer = {
"null",
- "null video format",
+ NULL_IF_CONFIG_SMALL("null video format"),
NULL,
NULL,
0,
Modified: trunk/libavformat/rl2.c
==============================================================================
--- trunk/libavformat/rl2.c (original)
+++ trunk/libavformat/rl2.c Tue Jun 3 18:20:54 2008
@@ -288,7 +288,7 @@ static int rl2_read_seek(AVFormatContext
AVInputFormat rl2_demuxer = {
"rl2",
- "rl2 format",
+ NULL_IF_CONFIG_SMALL("rl2 format"),
sizeof(Rl2DemuxContext),
rl2_probe,
rl2_read_header,
Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c (original)
+++ trunk/libavformat/rmdec.c Tue Jun 3 18:20:54 2008
@@ -793,7 +793,7 @@ static int64_t rm_read_dts(AVFormatConte
AVInputFormat rm_demuxer = {
"rm",
- "rm format",
+ NULL_IF_CONFIG_SMALL("RM format"),
sizeof(RMContext),
rm_probe,
rm_read_header,
Modified: trunk/libavformat/rmenc.c
==============================================================================
--- trunk/libavformat/rmenc.c (original)
+++ trunk/libavformat/rmenc.c Tue Jun 3 18:20:54 2008
@@ -432,7 +432,7 @@ static int rm_write_trailer(AVFormatCont
AVOutputFormat rm_muxer = {
"rm",
- "rm format",
+ NULL_IF_CONFIG_SMALL("RM format"),
"application/vnd.rn-realmedia",
"rm,ra",
sizeof(RMContext),
Modified: trunk/libavformat/rpl.c
==============================================================================
--- trunk/libavformat/rpl.c (original)
+++ trunk/libavformat/rpl.c Tue Jun 3 18:20:54 2008
@@ -348,7 +348,7 @@ static int rpl_read_packet(AVFormatConte
AVInputFormat rpl_demuxer = {
"rpl",
- "RPL/ARMovie format",
+ NULL_IF_CONFIG_SMALL("RPL/ARMovie format"),
sizeof(RPLContext),
rpl_probe,
rpl_read_header,
Modified: trunk/libavformat/rtpenc.c
==============================================================================
--- trunk/libavformat/rtpenc.c (original)
+++ trunk/libavformat/rtpenc.c Tue Jun 3 18:20:54 2008
@@ -356,7 +356,7 @@ static int rtp_write_packet(AVFormatCont
AVOutputFormat rtp_muxer = {
"rtp",
- "RTP output format",
+ NULL_IF_CONFIG_SMALL("RTP output format"),
NULL,
NULL,
sizeof(RTPDemuxContext),
Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c (original)
+++ trunk/libavformat/rtsp.c Tue Jun 3 18:20:54 2008
@@ -1354,7 +1354,7 @@ static int rtsp_read_close(AVFormatConte
#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 @@ static int sdp_read_close(AVFormatContex
#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 @@ static int redir_read_header(AVFormatCon
AVInputFormat redir_demuxer = {
"redir",
- "Redirector format",
+ NULL_IF_CONFIG_SMALL("Redirector format"),
0,
redir_probe,
redir_read_header,
Modified: trunk/libavformat/segafilm.c
==============================================================================
--- trunk/libavformat/segafilm.c (original)
+++ trunk/libavformat/segafilm.c Tue Jun 3 18:20:54 2008
@@ -283,7 +283,7 @@ static int film_read_close(AVFormatConte
AVInputFormat segafilm_demuxer = {
"film_cpk",
- "Sega FILM/CPK format",
+ NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"),
sizeof(FilmDemuxContext),
film_probe,
film_read_header,
Modified: trunk/libavformat/sierravmd.c
==============================================================================
--- trunk/libavformat/sierravmd.c (original)
+++ trunk/libavformat/sierravmd.c Tue Jun 3 18:20:54 2008
@@ -291,7 +291,7 @@ static int vmd_read_close(AVFormatContex
AVInputFormat vmd_demuxer = {
"vmd",
- "Sierra VMD format",
+ NULL_IF_CONFIG_SMALL("Sierra VMD format"),
sizeof(VmdDemuxContext),
vmd_probe,
vmd_read_header,
Modified: trunk/libavformat/siff.c
==============================================================================
--- trunk/libavformat/siff.c (original)
+++ trunk/libavformat/siff.c Tue Jun 3 18:20:54 2008
@@ -227,7 +227,7 @@ static int siff_read_packet(AVFormatCont
AVInputFormat siff_demuxer = {
"siff",
- "Beam Software SIFF",
+ NULL_IF_CONFIG_SMALL("Beam Software SIFF"),
sizeof(SIFFContext),
siff_probe,
siff_read_header,
Modified: trunk/libavformat/smacker.c
==============================================================================
--- trunk/libavformat/smacker.c (original)
+++ trunk/libavformat/smacker.c Tue Jun 3 18:20:54 2008
@@ -336,7 +336,7 @@ static int smacker_read_close(AVFormatCo
AVInputFormat smacker_demuxer = {
"smk",
- "Smacker Video",
+ NULL_IF_CONFIG_SMALL("Smacker video"),
sizeof(SmackerContext),
smacker_probe,
smacker_read_header,
Modified: trunk/libavformat/sol.c
==============================================================================
--- trunk/libavformat/sol.c (original)
+++ trunk/libavformat/sol.c Tue Jun 3 18:20:54 2008
@@ -147,7 +147,7 @@ static int sol_read_close(AVFormatContex
AVInputFormat sol_demuxer = {
"sol",
- "Sierra SOL Format",
+ NULL_IF_CONFIG_SMALL("Sierra SOL format"),
0,
sol_probe,
sol_read_header,
Modified: trunk/libavformat/swfdec.c
==============================================================================
--- trunk/libavformat/swfdec.c (original)
+++ trunk/libavformat/swfdec.c Tue Jun 3 18:20:54 2008
@@ -185,7 +185,7 @@ static int swf_read_packet(AVFormatConte
AVInputFormat swf_demuxer = {
"swf",
- "Flash format",
+ NULL_IF_CONFIG_SMALL("Flash format"),
sizeof(SWFContext),
swf_probe,
swf_read_header,
Modified: trunk/libavformat/swfenc.c
==============================================================================
--- trunk/libavformat/swfenc.c (original)
+++ trunk/libavformat/swfenc.c Tue Jun 3 18:20:54 2008
@@ -503,7 +503,7 @@ static int swf_write_trailer(AVFormatCon
#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 @@ AVOutputFormat swf_muxer = {
#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),
Modified: trunk/libavformat/thp.c
==============================================================================
--- trunk/libavformat/thp.c (original)
+++ trunk/libavformat/thp.c Tue Jun 3 18:20:54 2008
@@ -189,7 +189,7 @@ static int thp_read_packet(AVFormatConte
AVInputFormat thp_demuxer = {
"thp",
- "THP",
+ NULL_IF_CONFIG_SMALL("THP"),
sizeof(ThpDemuxContext),
thp_probe,
thp_read_header,
Modified: trunk/libavformat/tiertexseq.c
==============================================================================
--- trunk/libavformat/tiertexseq.c (original)
+++ trunk/libavformat/tiertexseq.c Tue Jun 3 18:20:54 2008
@@ -304,7 +304,7 @@ static int seq_read_close(AVFormatContex
AVInputFormat tiertexseq_demuxer = {
"tiertexseq",
- "Tiertex Limited SEQ format",
+ NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"),
sizeof(SeqDemuxContext),
seq_probe,
seq_read_header,
Modified: trunk/libavformat/tta.c
==============================================================================
--- trunk/libavformat/tta.c (original)
+++ trunk/libavformat/tta.c Tue Jun 3 18:20:54 2008
@@ -139,7 +139,7 @@ static int tta_read_seek(AVFormatContext
AVInputFormat tta_demuxer = {
"tta",
- "true-audio",
+ NULL_IF_CONFIG_SMALL("True Audio"),
sizeof(TTAContext),
tta_probe,
tta_read_header,
Modified: trunk/libavformat/txd.c
==============================================================================
--- trunk/libavformat/txd.c (original)
+++ trunk/libavformat/txd.c Tue Jun 3 18:20:54 2008
@@ -94,7 +94,7 @@ static int txd_read_close(AVFormatContex
AVInputFormat txd_demuxer =
{
"txd",
- "txd format",
+ NULL_IF_CONFIG_SMALL("txd format"),
0,
txd_probe,
txd_read_header,
Modified: trunk/libavformat/vc1test.c
==============================================================================
--- trunk/libavformat/vc1test.c (original)
+++ trunk/libavformat/vc1test.c Tue Jun 3 18:20:54 2008
@@ -103,7 +103,7 @@ static int vc1t_read_packet(AVFormatCont
AVInputFormat vc1t_demuxer = {
"vc1test",
- "VC1 test bitstream format",
+ NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"),
0,
vc1t_probe,
vc1t_read_header,
Modified: trunk/libavformat/vocdec.c
==============================================================================
--- trunk/libavformat/vocdec.c (original)
+++ trunk/libavformat/vocdec.c Tue Jun 3 18:20:54 2008
@@ -136,7 +136,7 @@ static int voc_read_packet(AVFormatConte
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,
Modified: trunk/libavformat/vocenc.c
==============================================================================
--- trunk/libavformat/vocenc.c (original)
+++ trunk/libavformat/vocenc.c Tue Jun 3 18:20:54 2008
@@ -90,7 +90,7 @@ static int voc_write_trailer(AVFormatCon
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),
Modified: trunk/libavformat/wav.c
==============================================================================
--- trunk/libavformat/wav.c (original)
+++ trunk/libavformat/wav.c Tue Jun 3 18:20:54 2008
@@ -262,7 +262,7 @@ static int wav_read_seek(AVFormatContext
#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 @@ AVInputFormat wav_demuxer = {
#ifdef CONFIG_WAV_MUXER
AVOutputFormat wav_muxer = {
"wav",
- "wav format",
+ NULL_IF_CONFIG_SMALL("WAV format"),
"audio/x-wav",
"wav",
sizeof(WAVContext),
Modified: trunk/libavformat/wc3movie.c
==============================================================================
--- trunk/libavformat/wc3movie.c (original)
+++ trunk/libavformat/wc3movie.c Tue Jun 3 18:20:54 2008
@@ -385,7 +385,7 @@ static int wc3_read_close(AVFormatContex
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,
Modified: trunk/libavformat/westwood.c
==============================================================================
--- trunk/libavformat/westwood.c (original)
+++ trunk/libavformat/westwood.c Tue Jun 3 18:20:54 2008
@@ -388,7 +388,7 @@ static int wsvqa_read_close(AVFormatCont
#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 @@ AVInputFormat wsaud_demuxer = {
#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,
Modified: trunk/libavformat/wv.c
==============================================================================
--- trunk/libavformat/wv.c (original)
+++ trunk/libavformat/wv.c Tue Jun 3 18:20:54 2008
@@ -226,7 +226,7 @@ static int wv_read_seek(AVFormatContext
AVInputFormat wv_demuxer = {
"wv",
- "WavPack",
+ NULL_IF_CONFIG_SMALL("WavPack"),
sizeof(WVContext),
wv_probe,
wv_read_header,
Modified: trunk/libavformat/xa.c
==============================================================================
--- trunk/libavformat/xa.c (original)
+++ trunk/libavformat/xa.c Tue Jun 3 18:20:54 2008
@@ -108,7 +108,7 @@ static int xa_read_packet(AVFormatContex
AVInputFormat xa_demuxer = {
"xa",
- "Maxis XA File Format",
+ NULL_IF_CONFIG_SMALL("Maxis XA File Format"),
sizeof(MaxisXADemuxContext),
xa_probe,
xa_read_header,
Modified: trunk/libavformat/yuv4mpeg.c
==============================================================================
--- trunk/libavformat/yuv4mpeg.c (original)
+++ trunk/libavformat/yuv4mpeg.c Tue Jun 3 18:20:54 2008
@@ -169,7 +169,7 @@ static int yuv4_write_header(AVFormatCon
#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 @@ static int yuv4_probe(AVProbeData *pd)
#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,
More information about the ffmpeg-cvslog
mailing list