move defines and enums out of cavsdata.h

[ffmpeg.git] / libavcodec / cavs.c

diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c
index eefacaf40390ace79f11c36e353cbcddb864f6c2..200668d2a1cdd1dfc0cce8693e442248857b7175 100644 (file)
--- a/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@ -29,9 +29,10 @@
 #include "bitstream.h"
 #include "golomb.h"
 #include "mpegvideo.h"
+#include "cavs.h"
+#ifdef CONFIG_CAVS_DECODER
 #include "cavsdata.h"
 
-#ifdef CONFIG_CAVS_DECODER
 typedef struct {
     MpegEncContext s;
     Picture picture; ///< currently decoded frame