1. pygame
  2. Untitled project
  3. pygame

Commits

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)

File config_unix.py

View file
         Dependency('SCRAP', '', 'libX11', ['X11']),
         Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
         Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['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', 'libSDL_gfx.so', ['SDL_gfx']),
     ]

File src/_gmovie.h

View file
 #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

View file
 #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. */