Fix compilation with all combinations of --disable-(de)muxers.

Originally committed as revision 5485 to svn://svn.ffmpeg.org/ffmpeg/trunk

Fix compilation with all combinations of --disable-(de)muxers.
Originally committed as revision 5485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2c8e2014 · Diego Biurrun · a5e9102b · 2c8e2014
Commit 2c8e2014 authored Jun 16, 2006 by Diego Biurrun
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 11 deletions

raw.c libavformat/raw.c +16 -11

No files found.
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -678,16 +678,7 @@ AVInputFormat pcm_ ## name ## _iformat = {\
    .value = codec,\
 };

-#if !defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS)
-
-#define PCMDEF(name, long_name, ext, codec) \
-    PCMINPUTDEF(name, long_name, ext, codec)
-
-#else
-
-#define PCMDEF(name, long_name, ext, codec) \
-    PCMINPUTDEF(name, long_name, ext, codec)\
-\
+#define PCMOUTPUTDEF(name, long_name, ext, codec) \
 AVOutputFormat pcm_ ## name ## _oformat = {\
    #name,\
    long_name,\
@@ -700,7 +691,21 @@ AVOutputFormat pcm_ ## name ## _oformat = {\
    raw_write_packet,\
    raw_write_trailer,\
 };
-#endif //CONFIG_MUXERS
+
+
+#if !defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS)
+#define PCMDEF(name, long_name, ext, codec) \
+        PCMINPUTDEF(name, long_name, ext, codec)
+#elif defined(CONFIG_MUXERS) && !defined(CONFIG_DEMUXERS)
+#define PCMDEF(name, long_name, ext, codec) \
+        PCMOUTPUTDEF(name, long_name, ext, codec)
+#elif defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS)
+#define PCMDEF(name, long_name, ext, codec) \
+        PCMINPUTDEF(name, long_name, ext, codec)\
+        PCMOUTPUTDEF(name, long_name, ext, codec)
+#else
+#define PCMDEF(name, long_name, ext, codec)
+#endif

 #ifdef WORDS_BIGENDIAN
 #define BE_DEF(s) s