Make vhook CFLAGS handling less confusing.

[ffmpeg] / libavformat / asf-enc.c

diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c
index 670e5a9d81881f48674172d9c230f806542cf7ad..f885bb743394d5b480ecf8d75d81907bfced937e 100644 (file)
--- a/libavformat/asf-enc.c
+++ b/libavformat/asf-enc.c
@@ -17,14 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "avi.h"
+#include "riff.h"
 #include "asf.h"
 
 #undef NDEBUG
 #include <assert.h>
 
-#ifdef CONFIG_MUXERS
-
 
 #define ASF_INDEXED_INTERVAL    10000000
 #define ASF_INDEX_BLOCK         600
@@ -823,6 +821,7 @@ static int asf_write_trailer(AVFormatContext *s)
     return 0;
 }
 
+#ifdef CONFIG_ASF_MUXER
 AVOutputFormat asf_muxer = {
     "asf",
     "asf format",
@@ -840,7 +839,9 @@ AVOutputFormat asf_muxer = {
     asf_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
 };
+#endif
 
+#ifdef CONFIG_ASF_STREAM_MUXER
 AVOutputFormat asf_stream_muxer = {
     "asf_stream",
     "asf format",
@@ -858,4 +859,4 @@ AVOutputFormat asf_stream_muxer = {
     asf_write_trailer,
     .flags = AVFMT_GLOBALHEADER,
 };
-#endif //CONFIG_MUXERS
+#endif //CONFIG_ASF_STREAM_MUXER