[Redbutton-devel] SF.net SVN: redbutton:[515] redbutton-browser/trunk

[<ski...@us...>]

Revision: 515
          http://redbutton.svn.sourceforge.net/redbutton/?rev=515&view=rev
Author:   skilvington
Date:     2009-01-22 16:50:57 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
ffmpeg includes have moved in newer versions of the libraries

Modified Paths:
--------------
    redbutton-browser/trunk/MHEGDisplay.c
    redbutton-browser/trunk/MHEGStreamPlayer.h
    redbutton-browser/trunk/mpegts.c
    redbutton-browser/trunk/utils.h
    redbutton-browser/trunk/videoout_xshm.c
    redbutton-browser/trunk/videoout_xshm.h

Modified: redbutton-browser/trunk/MHEGDisplay.c
===================================================================
--- redbutton-browser/trunk/MHEGDisplay.c	2009-01-19 09:23:56 UTC (rev 514)
+++ redbutton-browser/trunk/MHEGDisplay.c	2009-01-22 16:50:57 UTC (rev 515)
@@ -13,8 +13,8 @@
 #include <X11/Intrinsic.h>
 #include <X11/Shell.h>
 #include <X11/keysym.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/swscale.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
 
 #include "MHEGEngine.h"
 #include "MHEGDisplay.h"

Modified: redbutton-browser/trunk/MHEGStreamPlayer.h
===================================================================
--- redbutton-browser/trunk/MHEGStreamPlayer.h	2009-01-19 09:23:56 UTC (rev 514)
+++ redbutton-browser/trunk/MHEGStreamPlayer.h	2009-01-22 16:50:57 UTC (rev 515)
@@ -8,8 +8,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <pthread.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
 
 #include "ISO13522-MHEG-5.h"
 #include "MHEGBackend.h"

Modified: redbutton-browser/trunk/mpegts.c
===================================================================
--- redbutton-browser/trunk/mpegts.c	2009-01-19 09:23:56 UTC (rev 514)
+++ redbutton-browser/trunk/mpegts.c	2009-01-22 16:50:57 UTC (rev 515)
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
 
 #include "mpegts.h"
 #include "utils.h"

Modified: redbutton-browser/trunk/utils.h
===================================================================
--- redbutton-browser/trunk/utils.h	2009-01-19 09:23:56 UTC (rev 514)
+++ redbutton-browser/trunk/utils.h	2009-01-22 16:50:57 UTC (rev 515)
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 #include <stdarg.h>
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
 
 #ifndef MIN
 #define MIN(a, b)	((a) < (b) ? (a) : (b))

Modified: redbutton-browser/trunk/videoout_xshm.c
===================================================================
--- redbutton-browser/trunk/videoout_xshm.c	2009-01-19 09:23:56 UTC (rev 514)
+++ redbutton-browser/trunk/videoout_xshm.c	2009-01-22 16:50:57 UTC (rev 515)
@@ -7,7 +7,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XShm.h>
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
 
 #include "MHEGEngine.h"
 #include "MHEGVideoOutput.h"

Modified: redbutton-browser/trunk/videoout_xshm.h
===================================================================
--- redbutton-browser/trunk/videoout_xshm.h	2009-01-19 09:23:56 UTC (rev 514)
+++ redbutton-browser/trunk/videoout_xshm.h	2009-01-22 16:50:57 UTC (rev 515)
@@ -8,8 +8,8 @@
 #include <stdint.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/swscale.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 typedef struct
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.