[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.h gui...
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.h gui... |
Date: |
Tue, 17 Jul 2007 22:05:04 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 07/07/17 22:05:03
Modified files:
. : ChangeLog
backend : sound_handler_sdl.h
gui : gnash.cpp
libbase : embedVideoDecoderFfmpeg.cpp
embedVideoDecoderFfmpeg.h
server/asobj : NetStreamFfmpeg.h SoundFfmpeg.h
Log message:
Nick Warne, linking fix.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3745&r2=1.3746
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.h?cvsroot=gnash&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3745
retrieving revision 1.3746
diff -u -b -r1.3745 -r1.3746
--- ChangeLog 17 Jul 2007 09:33:57 -0000 1.3745
+++ ChangeLog 17 Jul 2007 22:05:02 -0000 1.3746
@@ -1,3 +1,9 @@
+2007-07-17 Nick Warne <nickw>
+
+ * backend/sound_handler_sdl.h, libbase/embedVideoDecoderFfmpeg.{cpp,h},
+ server/asobj/{Sound, Netstream}Ffmpeg.h, gui/gnash.cpp: Fix for
+ linking.
+
2007-07-17 Zou Lunkai <address@hidden>
* testsuite/actionscript.all/MovieClip.as: more tests, all passed.
Index: backend/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- backend/sound_handler_sdl.h 3 Jul 2007 04:31:59 -0000 1.28
+++ backend/sound_handler_sdl.h 17 Jul 2007 22:05:03 -0000 1.29
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// $Id: sound_handler_sdl.h,v 1.28 2007/07/03 04:31:59 strk Exp $
+// $Id: sound_handler_sdl.h,v 1.29 2007/07/17 22:05:03 nihilus Exp $
#ifndef SOUND_HANDLER_SDL_H
#define SOUND_HANDLER_SDL_H
@@ -26,7 +26,9 @@
#include "log.h"
#ifdef USE_FFMPEG
+extern "C" {
#include <ffmpeg/avcodec.h>
+}
#elif defined(USE_MAD)
#include <mad.h>
#endif
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- gui/gnash.cpp 6 Jul 2007 15:10:43 -0000 1.83
+++ gui/gnash.cpp 17 Jul 2007 22:05:03 -0000 1.84
@@ -27,7 +27,9 @@
#include "debugger.h"
#ifdef HAVE_FFMPEG_AVCODEC_H
+extern "C" {
# include "ffmpeg/avcodec.h"
+}
#endif
#ifdef HAVE_GST_GST_H
Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libbase/embedVideoDecoderFfmpeg.cpp 1 Jul 2007 10:54:08 -0000 1.20
+++ libbase/embedVideoDecoderFfmpeg.cpp 17 Jul 2007 22:05:03 -0000 1.21
@@ -26,7 +26,9 @@
#include "embedVideoDecoderFfmpeg.h"
#ifdef HAVE_SWSCALE_H
+extern "C" {
#include <ffmpeg/swscale.h>
+}
#endif
#include <boost/scoped_array.hpp>
Index: libbase/embedVideoDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/embedVideoDecoderFfmpeg.h 1 Jul 2007 10:54:08 -0000 1.7
+++ libbase/embedVideoDecoderFfmpeg.h 17 Jul 2007 22:05:03 -0000 1.8
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// $Id: embedVideoDecoderFfmpeg.h,v 1.7 2007/07/01 10:54:08 bjacques Exp $
+// $Id: embedVideoDecoderFfmpeg.h,v 1.8 2007/07/17 22:05:03 nihilus Exp $
#ifndef __EMBEDVIDEODECODERFFMPEG_H__
#define __EMBEDVIDEODECODERFFMPEG_H__
@@ -28,7 +28,9 @@
#include <vector>
#include "embedVideoDecoder.h"
+extern "C" {
#include <ffmpeg/avcodec.h>
+}
#include "image.h"
namespace gnash {
Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/NetStreamFfmpeg.h 1 Jul 2007 10:54:29 -0000 1.47
+++ server/asobj/NetStreamFfmpeg.h 17 Jul 2007 22:05:03 -0000 1.48
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: NetStreamFfmpeg.h,v 1.47 2007/07/01 10:54:29 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.48 2007/07/17 22:05:03 nihilus Exp $ */
#ifndef __NETSTREAMFFMPEG_H__
#define __NETSTREAMFFMPEG_H__
@@ -39,7 +39,9 @@
#include "impl.h"
#include "video_stream_instance.h"
+extern "C" {
#include <ffmpeg/avformat.h>
+}
#include "image.h"
#include "StreamProvider.h"
Index: server/asobj/SoundFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/SoundFfmpeg.h 1 Jul 2007 10:54:31 -0000 1.7
+++ server/asobj/SoundFfmpeg.h 17 Jul 2007 22:05:03 -0000 1.8
@@ -32,7 +32,9 @@
#include <boost/bind.hpp>
#include <boost/thread/mutex.hpp>
+extern "C" {
#include <ffmpeg/avformat.h>
+}
namespace gnash {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.h gui...,
Markus Gothe <=