Commits

zeroth  committed ee0f0dc

Updates, and almost compilation state.
-Tyler

  • Participants
  • Parent commits b69c7ba
  • Branches tylerthemovie

Comments (0)

Files changed (3)

File config_unix.py

 
 #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
 origincdirs = ['/include', '/include/SDL', '/include/SDL',
-               '/include/smpeg', 'include/ffmpeg']
+               '/include/smpeg', ]
 origlibdirs = ['/lib','/lib64','/X11R6/lib']
 
 def confirm(message):
         Dependency('SCRAP', '', 'libX11', ['X11']),
         Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
         Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
-        Dependency('FFMPEG', 'ffmpeg/avformat.h', 'libavformat.so', ['avformat', 'avdevice', 'avcodec',  'avutil', 'swscale']),        
+        Dependency('FFMPEG', 'libavformat/avformat.h', 'libavformat.so', ['avformat', 'avdevice', 'avcodec',  'avutil', 'swscale']),        
         #Dependency('FFMPEG', 'ffmpeg/avformat.h',  'libavformat.so', ['avformat']) ,
         #Dependency('FFMPEG', 'ffmpeg/avstring.h',  'libavstring.so', ['avstring']) ,
         #Dependency('FFMPEG', 'ffmpeg/swscale.h',  'libswscale.so', ['swscale']) ,

File src/ff_movie.c

  */
 
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avstring.h>
+#include <libavutil/avstring.h>
 //#include <ffmpeg/rtsp.h>
 #include <ffmpeg/swscale.h>
 //#include <ffmpeg/opt.h>
 #define FF_REFRESH_EVENT (SDL_USEREVENT + 1)
 #define FF_QUIT_EVENT    (SDL_USEREVENT + 2)
 
+static PyAudioStream* _new_audio_stream();
+static PyVideoStream* _new_video_stream();
+static PySubtitleStream* _new_sub_stream();
+
 //static int sws_flags = SWS_BICUBIC;
 
 

File src/ff_movie.h

 #include <Python.h>
 #include <SDL.h>
 #include <SDL_thread.h>
-#include <ffmpeg/avformat.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)
     AV_SYNC_EXTERNAL_CLOCK, /* synchronize to an external clock */
 };
 
-typedef struct
+typedef struct PyVideoStream
 {
     PyObject_HEAD
 
 
 } PyVideoStream;
 
-typedef struct
+typedef struct PyAudioStream
 {
     PyObject_HEAD
 
 
 } PyAudioStream;
 
-typedef struct
+typedef struct PySubtitleStream
 {
     PyObject_HEAD
 
 
 } PySubtitleStream;
 
-typedef struct
+typedef struct PyMovie
 {
     PyObject_HEAD
     PyObject *streams;      /* lists object for all the streams of the video file. */
 static PyObject* PyMovie_New (char *fname, SDL_Surface *surf);
 
 /*internals */
-static PyAudioStream* _new_audio_stream();
-static PyVideoStream* _new_video_stream();
-static PySubtitleStream* _new_sub_stream();
+
 
 static void _dealloc_aud_stream(PyAudioStream *pas);
 static void _dealloc_vid_stream(PyVideoStream *pvs);