# HG changeset patch # User diego # Date 1218818885 0 # Node ID 9a307cfd59a368b282a4bf5b740329132c15f79e # Parent 514470f7afed3c2eeef96838467f05999180f894 Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat declarations by more specific CONFIG_FOOBAR_MUXER conditions. diff -r 514470f7afed -r 9a307cfd59a3 raw.c --- a/raw.c Fri Aug 15 16:37:59 2008 +0000 +++ b/raw.c Fri Aug 15 16:48:05 2008 +0000 @@ -528,7 +528,7 @@ }; #endif -#ifdef CONFIG_MUXERS +#ifdef CONFIG_AC3_MUXER AVOutputFormat ac3_muxer = { "ac3", NULL_IF_CONFIG_SMALL("raw AC-3"), @@ -554,7 +554,7 @@ .value = CODEC_ID_DIRAC, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_DIRAC_MUXER AVOutputFormat dirac_muxer = { "dirac", NULL_IF_CONFIG_SMALL("raw Dirac"), @@ -581,7 +581,7 @@ .value = CODEC_ID_DTS, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_DTS_MUXER AVOutputFormat dts_muxer = { "dts", NULL_IF_CONFIG_SMALL("raw DTS"), @@ -608,7 +608,7 @@ .value = CODEC_ID_FLAC, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_FLAC_MUXER AVOutputFormat flac_muxer = { "flac", NULL_IF_CONFIG_SMALL("raw FLAC"), @@ -647,7 +647,7 @@ .value = CODEC_ID_H261, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_H261_MUXER AVOutputFormat h261_muxer = { "h261", NULL_IF_CONFIG_SMALL("raw H.261"), @@ -674,7 +674,7 @@ .value = CODEC_ID_H263, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_H263_MUXER AVOutputFormat h263_muxer = { "h263", NULL_IF_CONFIG_SMALL("raw H.263"), @@ -701,7 +701,7 @@ .value = CODEC_ID_H264, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_H264_MUXER AVOutputFormat h264_muxer = { "h264", NULL_IF_CONFIG_SMALL("raw H.264 video format"), @@ -740,7 +740,7 @@ .value = CODEC_ID_MPEG4, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_M4V_MUXER AVOutputFormat m4v_muxer = { "m4v", NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), @@ -767,7 +767,7 @@ .value = CODEC_ID_MJPEG, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_MJPEG_MUXER AVOutputFormat mjpeg_muxer = { "mjpeg", NULL_IF_CONFIG_SMALL("MJPEG video"), @@ -794,7 +794,7 @@ .value = CODEC_ID_MLP, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_MPEG1VIDEO_MUXER AVOutputFormat mpeg1video_muxer = { "mpeg1video", NULL_IF_CONFIG_SMALL("MPEG video"), @@ -809,7 +809,7 @@ }; #endif -#ifdef CONFIG_MUXERS +#ifdef CONFIG_MPEG2VIDEO_MUXER AVOutputFormat mpeg2video_muxer = { "mpeg2video", NULL_IF_CONFIG_SMALL("MPEG-2 video"), @@ -835,7 +835,7 @@ .value = CODEC_ID_MPEG1VIDEO, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_NULL_MUXER AVOutputFormat null_muxer = { "null", NULL_IF_CONFIG_SMALL("null video format"), @@ -866,7 +866,7 @@ .value = CODEC_ID_RAWVIDEO, }; -#ifdef CONFIG_MUXERS +#ifdef CONFIG_RAWVIDEO_MUXER AVOutputFormat rawvideo_muxer = { "rawvideo", NULL_IF_CONFIG_SMALL("raw video format"),