diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavformat/img2.c | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index c0b5de2144..244b050802 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -305,7 +305,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt) } } -#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) +#if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER /******************************************************/ /* image output */ @@ -370,10 +370,10 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */ +#endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */ /* input */ -#ifdef CONFIG_IMAGE2_DEMUXER +#if CONFIG_IMAGE2_DEMUXER AVInputFormat image2_demuxer = { "image2", NULL_IF_CONFIG_SMALL("image2 sequence"), @@ -387,7 +387,7 @@ AVInputFormat image2_demuxer = { AVFMT_NOFILE, }; #endif -#ifdef CONFIG_IMAGE2PIPE_DEMUXER +#if CONFIG_IMAGE2PIPE_DEMUXER AVInputFormat image2pipe_demuxer = { "image2pipe", NULL_IF_CONFIG_SMALL("piped image2 sequence"), @@ -399,7 +399,7 @@ AVInputFormat image2pipe_demuxer = { #endif /* output */ -#ifdef CONFIG_IMAGE2_MUXER +#if CONFIG_IMAGE2_MUXER AVOutputFormat image2_muxer = { "image2", NULL_IF_CONFIG_SMALL("image2 sequence"), @@ -414,7 +414,7 @@ AVOutputFormat image2_muxer = { .flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE }; #endif -#ifdef CONFIG_IMAGE2PIPE_MUXER +#if CONFIG_IMAGE2PIPE_MUXER AVOutputFormat image2pipe_muxer = { "image2pipe", NULL_IF_CONFIG_SMALL("piped image2 sequence"), |