Commits

Anonymous committed 1aee118

Compilation fixes

Comments (0)

Files changed (4)

 SCRAP = -lX11
 PORTMIDI = -lportmidi
 PORTTIME = -lporttime
-FFMPEG   = --lavcodec -lavdevice -lavformat -lavutil -lswscale
+FFMPEG   = -lavcodec -lavdevice -lavformat -lavutil -lswscale
 #--EndConfig
 
 #DEBUG = -C-W -C-Wall

src/audioconvert.h

  */
 
 
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 
 
 /**
  * Imported by movie.py(hopefully)
  */
 
-
-#include <libavutil/avstring.h>
-//#include <ffmpeg/rtsp.h>
-#include <ffmpeg/swscale.h>
-//#include <ffmpeg/opt.h>
-#include <libavdevice/avdevice.h>
-
-#include "pygamedocs.h"
-#include "pygame.h"
-#include "pgcompat.h"
 #include "ff_movie.h"
-#include "audioconvert.h"
 
 #ifdef __MINGW32__
 #undef main /* We don't want SDL to override our main() */
+
+#include <libavutil/avstring.h>
+
+#include <ffmpeg/swscale.h>
+
+#include <libavdevice/avdevice.h>
+
+#include "pygamedocs.h"
+#include "pygame.h"
+#include "pgcompat.h"
+#include "audioconvert.h"
 
 #include <Python.h>
 #include <SDL.h>
 #include <SDL_thread.h>
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
-#include "audioconvert.h"
+
 
 #define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
 #define MAX_AUDIOQ_SIZE (5 * 16 * 1024)