Lenard Lindstrom  committed aa10334

Fix a _movie module bug where the module fails to build under Debian Linux
because the libavformat and libswscale header subdirectories are in ffmpeg.
The changes makes the module's ffmpeg includes consistent with ffmpeg itself.

  • Participants
  • Parent commits bd8381c
  • Branches default

Comments (0)

Files changed (3)


         Dependency('SCRAP', '', 'libX11', ['X11']),
         Dependency('PORTMIDI', 'portmidi.h', '', ['portmidi']),
         Dependency('PORTTIME', 'porttime.h', '', ['porttime']),
-        FFMPEGDependency('AVFORMAT', 'avformat.h', 'libavformat.a', ['avformat'], ['/include/libavformat', '/include/ffmpeg']),
-        FFMPEGDependency('SWSCALE', 'swscale.h', 'libswscale.a', ['swscale'], ['/include/libswscale', '/include/ffmpeg']),
+        FFMPEGDependency('AVFORMAT', 'libavformat/avformat.h', 'libavformat.a', ['avformat'], ['/include', '/include/ffmpeg']),
+        FFMPEGDependency('SWSCALE', 'libswscale/swscale.h', 'libswscale.a', ['swscale'], ['/include', '/include/ffmpeg']),
         DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'freetype-config', '2.0', ['freetype'], '--ftversion'),
         #Dependency('GFX', 'SDL_gfxPrimitives.h', '', ['SDL_gfx']),

File src/_gmovie.h

 #include <Python.h>
 #include <SDL.h>
 #include <SDL_thread.h>
-#include <avformat.h>
-#include <swscale.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
 /*constant definitions */

File src/_gsound.h

 #include <SDL/SDL_mixer.h>
 #include <SDL.h>
 #include <SDL_thread.h>
-#include <avformat.h>
+#include <libavformat/avformat.h>
 /* Buffer Node for a simple FIFO queue of sound samples. */