[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac gui/gnash.cpp gui/...
|
From: |
Russ Nelson |
|
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac gui/gnash.cpp gui/... |
|
Date: |
Fri, 23 May 2008 05:58:09 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Russ Nelson <nelsonrn> 08/05/23 05:58:09
Modified files:
. : ChangeLog configure.ac
gui : gnash.cpp gtk.cpp
libmedia : MediaParser.h
libmedia/ffmpeg: AudioDecoderFfmpeg.h VideoDecoderFfmpeg.cpp
VideoDecoderFfmpeg.h ffmpegNetStreamUtil.h
sound_handler_sdl.h
macros : ffmpeg.m4
server/asobj : NetStreamFfmpeg.h SoundFfmpeg.h
Log message:
* All files were changed to support the new method for location
of ffmpeg include files. They were moved from .../ffmpeg/* into
.../lib*/*. Also, they changed the way they express the version
number in avcodec.h, which we are parsing to avoid compiling
because we support cross-compilation. We now support that also.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6680&r2=1.6681
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.535&r2=1.536
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.178&r2=1.179
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaParser.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/ffmpegNetStreamUtil.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/sound_handler_sdl.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.h?cvsroot=gnash&r1=1.14&r2=1.15
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6680
retrieving revision 1.6681
diff -u -b -r1.6680 -r1.6681
--- ChangeLog 23 May 2008 02:30:19 -0000 1.6680
+++ ChangeLog 23 May 2008 05:58:07 -0000 1.6681
@@ -1,3 +1,11 @@
+ 2008-05-23 Russ Nelson <address@hidden>
+
+ * All files were changed to support the new method for location
+ of ffmpeg include files. They were moved from .../ffmpeg/* into
+ .../lib*/*. Also, they changed the way they express the version
+ number in avcodec.h, which we are parsing to avoid compiling
+ because we support cross-compilation. We now support that also.
+
2008-05-23 Zou Lunkai <address@hidden>
* server/styles.cpp: read_bit() reduction, cleanups.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -b -r1.535 -r1.536
--- configure.ac 21 May 2008 08:39:35 -0000 1.535
+++ configure.ac 23 May 2008 05:58:08 -0000 1.536
@@ -2547,11 +2547,11 @@
echo " This version of ffmpeg may not work!" >&3
echo " Version 51.27.0 or newer is highly recommended."
>&3
else
- avformat_h=`echo $avcodec_h | sed 's/avcodec/avformat/g'`
- if test ! -f "$avformat_h"; then
+ if test x"${avformat_h}" == x; then
echo " ERROR: FFMPEG's libavcodec header is installed but not
libavformat." >&3
echo " You can install FFMPEG from
http://ffmpeg.mplayerhq.hu"; >&3
echo " or .deb users: apt-get install libavformat-dev"
>&3
+ echo " or explicitly set the path using
--with-ffmpeg-incl=" >&5
echo " or reconfigure with --enable-media=gst" >&3
else
if test x"$FFMPEG_CFLAGS" != x; then
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- gui/gnash.cpp 19 May 2008 13:03:55 -0000 1.121
+++ gui/gnash.cpp 23 May 2008 05:58:08 -0000 1.122
@@ -33,6 +33,12 @@
}
#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+extern "C" {
+# include "libavcodec/avcodec.h"
+}
+#endif
+
#ifdef HAVE_GST_GST_H
# include "gst/gst.h"
# include "gst/gstversion.h"
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- gui/gtk.cpp 7 May 2008 14:38:14 -0000 1.178
+++ gui/gtk.cpp 23 May 2008 05:58:08 -0000 1.179
@@ -53,6 +53,12 @@
}
#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+extern "C" {
+# include "libavcodec/avcodec.h" // Only for the version number
+}
+#endif
+
#ifdef HAVE_GST_GST_H
# include "gst/gstversion.h" // Only for the version number
#endif
Index: libmedia/MediaParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaParser.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libmedia/MediaParser.h 5 Mar 2008 03:55:54 -0000 1.14
+++ libmedia/MediaParser.h 23 May 2008 05:58:08 -0000 1.15
@@ -28,10 +28,17 @@
#include "tu_file.h"
#ifdef USE_FFMPEG
-extern "C"
-{
- #include <ffmpeg/avcodec.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+extern "C" {
+# include "ffmpeg/avcodec.h"
}
+#endif
+
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+extern "C" {
+# include "libavcodec/avcodec.h"
+}
+#endif
#endif // USE_FFMPEG
#include <memory>
Index: libmedia/ffmpeg/AudioDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/ffmpeg/AudioDecoderFfmpeg.h 5 Mar 2008 03:55:54 -0000
1.3
+++ libmedia/ffmpeg/AudioDecoderFfmpeg.h 23 May 2008 05:58:09 -0000
1.4
@@ -24,9 +24,17 @@
#define __STDC_CONSTANT_MACROS
#endif
+#ifdef HAVE_FFMPEG_AVCODEC_H
extern "C" {
-#include <ffmpeg/avcodec.h>
+# include "ffmpeg/avcodec.h"
}
+#endif
+
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+extern "C" {
+# include "libavcodec/avcodec.h"
+}
+#endif
#include "log.h"
#include "AudioDecoder.h"
Index: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 14 May 2008 00:01:35 -0000
1.8
+++ libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 23 May 2008 05:58:09 -0000
1.9
@@ -20,11 +20,20 @@
#include "VideoDecoderFfmpeg.h"
-#ifdef HAVE_SWSCALE_H
+#ifdef HAVE_FFMPEG_SWSCALE_H
+#define HAVE_SWSCALE_H 1
extern "C" {
#include <ffmpeg/swscale.h>
}
#endif
+
+#ifdef HAVE_LIBSWSCALE_SWSCALE_H
+#define HAVE_SWSCALE_H 1
+extern "C" {
+#include <libswscale/swscale.h>
+}
+#endif
+
#include <boost/scoped_array.hpp>
//#include <boost/foreach.hpp>
#include <boost/bind.hpp>
Index: libmedia/ffmpeg/VideoDecoderFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libmedia/ffmpeg/VideoDecoderFfmpeg.h 22 Mar 2008 20:29:20 -0000
1.9
+++ libmedia/ffmpeg/VideoDecoderFfmpeg.h 23 May 2008 05:58:09 -0000
1.10
@@ -28,10 +28,17 @@
#include "log.h"
#include "VideoDecoder.h"
+#ifdef HAVE_FFMPEG_AVCODEC_H
extern "C" {
-#include <ffmpeg/avcodec.h>
+# include "ffmpeg/avcodec.h"
}
+#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+extern "C" {
+# include "libavcodec/avcodec.h"
+}
+#endif
namespace gnash {
namespace media {
Index: libmedia/ffmpeg/ffmpegNetStreamUtil.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/ffmpegNetStreamUtil.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libmedia/ffmpeg/ffmpegNetStreamUtil.h 21 May 2008 17:04:06 -0000
1.8
+++ libmedia/ffmpeg/ffmpegNetStreamUtil.h 23 May 2008 05:58:09 -0000
1.9
@@ -29,11 +29,23 @@
#include "dsodefs.h" //For DSOEXPORT
#ifdef USE_FFMPEG
+#ifdef HAVE_FFMPEG_AVCODEC_H
extern "C" {
#include <ffmpeg/avcodec.h>
}
#endif
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+#endif
+#endif
+
+#include <queue>
+
+#include <iconv.h>
+
#include <deque>
#include <iconv.h>
Index: libmedia/ffmpeg/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/sound_handler_sdl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libmedia/ffmpeg/sound_handler_sdl.h 16 May 2008 13:57:19 -0000 1.10
+++ libmedia/ffmpeg/sound_handler_sdl.h 23 May 2008 05:58:09 -0000 1.11
@@ -27,9 +27,17 @@
#include "log.h"
#ifdef USE_FFMPEG
+#ifdef HAVE_FFMPEG_AVCODEC_H
extern "C" {
-#include <ffmpeg/avcodec.h>
+# include "ffmpeg/avcodec.h"
}
+#endif
+
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+extern "C" {
+# include "libavcodec/avcodec.h"
+}
+#endif
#elif defined(USE_MAD)
#include <mad.h>
#endif
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- macros/ffmpeg.m4 5 Mar 2008 03:55:55 -0000 1.54
+++ macros/ffmpeg.m4 23 May 2008 05:58:09 -0000 1.55
@@ -26,17 +26,28 @@
AC_ARG_WITH(ffmpeg_incl, AC_HELP_STRING([--with-ffmpeg-incl], [directory
where ffmpeg headers are]), with_ffmpeg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_ffmpeg_incl,[
if test x"${with_ffmpeg_incl}" != x ; then
+ avcodec_h=""
if test -f ${with_ffmpeg_incl}/ffmpeg/avcodec.h ; then
ac_cv_path_ffmpeg_incl="-I`(cd ${with_ffmpeg_incl}; pwd)`"
avcodec_h="${with_ffmpeg_incl}/ffmpeg/avcodec.h"
+ fi
+ if test -f ${with_ffmpeg_incl}/libavcodec/avcodec.h ; then
+ ac_cv_path_ffmpeg_incl="-I`(cd ${with_ffmpeg_incl}; pwd)`"
+ if test x$avcodec_h != x; then
+ AC_MSG_ERROR([${with_ffmpeg_incl} directory contains both the
ffmpeg/avcodec.h and libavcodec/avcodec.h headers])
+ fi
+ avcodec_h="${with_ffmpeg_incl}/libavcodec/avcodec.h"
+ fi
+ if test x$avcodec_h != x; then
CFLAGS="$ac_cv_path_ffmpeg_incl $CFLAGS"
else
- AC_MSG_ERROR([${with_ffmpeg_incl} directory doesn't contain the
ffmpeg/avcodec.h header])
+ AC_MSG_ERROR([${with_ffmpeg_incl} directory contains neither the
ffmpeg/avcodec.h nor libavcodec/avcodec.h header])
fi
fi
])
if test x${cross_compiling} = xno; then
+ AC_MSG_CHECKING([location of avcodec.h using pkgconfig])
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
if $PKG_CONFIG --exists libavcodec; then
# Some systems return /usr/include/ffmpeg, others /usr/include.
@@ -49,7 +60,9 @@
# ac_cv_path_ffmpeg_incl might include several paths (e.g. pointers to
# external libraries used by ffmpeg). Let's find the right one.
for i in `$PKG_CONFIG --cflags-only-I libavcodec |sed -e 's:-I::g'`; do
- if test -e "$i"/avcodec.h -o -e "$i"/ffmpeg/avcodec.h; then
+ if test -e "$i"/avcodec.h -o \
+ -e "$i"/ffmpeg/avcodec.h -o \
+ -e "$i"/libavcodec/avcodec.h; then
topdir="$i"
break
fi
@@ -57,7 +70,8 @@
else
# Let's see if ffmpeg is installed without using pkgconfig...
for i in /usr/include /usr/local/include /opt/ffmpeg/include; do
- if test -e "$i"/ffmpeg/avcodec.h; then
+ if test -e "$i"/ffmpeg/avcodec.h -o \
+ -e "$i"/libavcodec/avcodec.h; then
topdir="$i"
break
fi
@@ -67,13 +81,19 @@
topdir=`echo "$topdir" | sed 's:/ffmpeg *$::'`
# Gets "" if not installed
if test x"$topdir" != x; then
+ if test -e "$topdir/ffmpeg/avcodec.h"; then
avcodec_h="$topdir/ffmpeg/avcodec.h"
+ else
+ avcodec_h="$topdir/libavcodec/avcodec.h"
+ fi
fi
fi
+ AC_MSG_RESULT($avcodec_h)
fi
dnl incllist is inherited from configure.ac.
if test x"${ac_cv_path_ffmpeg_incl}" = x ; then
+ AC_MSG_CHECKING([location of avcodec.h using incllist])
for i in $incllist; do
if test -f $i/ffmpeg/avcodec.h; then
ac_cv_path_ffmpeg_incl="-I$i"
@@ -82,7 +102,15 @@
avcodec_h="$i/ffmpeg/avcodec.h"
break
fi
+ if test -f $i/libavcodec/avcodec.h; then
+ ac_cv_path_ffmpeg_incl="-I$i"
+ CFLAGS="$ac_cv_path_ffmpeg_incl $CFLAGS"
+ topdir=$i
+ avcodec_h="$i/libavcodec/avcodec.h"
+ break
+ fi
done
+ AC_MSG_RESULT($avcodec_h)
fi
if test x"${ac_cv_path_ffmpeg_incl}" = x; then
@@ -90,7 +118,11 @@
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [ac_cv_path_ffmpeg_incl=""])
fi
else
+ if echo $avcodec_h | grep -q ffmpeg; then
AC_DEFINE(HAVE_FFMPEG_AVCODEC_H, 1, [Define if you have avcodec.h
installed.])
+ else
+ AC_DEFINE(HAVE_LIBAVCODEC_AVCODEC_H, 1, [Define if you have avcodec.h
installed.])
+ fi
fi
dnl Find and check libavcodec version number to make sure we have a usable
@@ -131,6 +163,19 @@
dnl (note, LIBAVCODEC_VERSION also changes from a quoted string to unquoted)
dnl see http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/2005-July/000570.html
dnl
+dnl
+dnl This changed from the above to
+dnl #define LIBAVCODEC_VERSION_MAJOR 51
+dnl #define LIBAVCODEC_VERSION_MINOR 54
+dnl #define LIBAVCODEC_VERSION_MICRO 0
+dnl
+dnl #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+dnl LIBAVCODEC_VERSION_MINOR, \
+dnl LIBAVCODEC_VERSION_MICRO)
+dnl #define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_MAJOR, \
+dnl LIBAVCODEC_VERSION_MINOR, \
+dnl LIBAVCODEC_VERSION_MICRO)
+
dnl Those deb-heads at Debian redefine LIBAVCODEC_VERSION in their versions to
dnl (e.g.) 1d.51.38.0 or dnl 0d.51.11.0 - we need to discard the prefixed
dnl rubbish.
@@ -155,14 +200,18 @@
# Check avcodec version number, if it was found
if test x"${avcodec_h}" != x; then
- AC_MSG_CHECKING([for ffmpeg version])
+ AC_MSG_CHECKING([ffmpeg version])
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} |
sed -e "s%[[^0-9]]%%g"``$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h}
| sed -e "s%[[^0-9]]%%g"``$EGREP "define LIBAVCODEC_VERSION_MICRO "
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+ ffmpeg_num_version=$ffmpeg_version
+ if test x"${ffmpeg_version}" = x ; then
- ffmpeg_num_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | sed
-e "s%[[^0-9]]%%g"`
- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | sed -e
"s%[[^0-9.]]%%g"`
+ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | sed
-e "s%[[^0-9]]%%g"`
+ ffmpeg_num_version=$ffmpeg_version
if test x"${ffmpeg_version}" = x ; then
ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | sed -e
"s%[[^0-9.]]%%g"`
- ffmpeg_num_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | sed
-e "s%[[^0-9]]%%g"`
+ ffmpeg_num_version=$ffmpeg_version
+ fi
fi
AC_MSG_RESULT($ffmpeg_num_version)
@@ -197,10 +246,29 @@
FFMPEG_CFLAGS=""
fi
- if test x"$avcodec_h" != x; then
- swscale_h="`dirname $avcodec_h`/swscale.h"
- if test -f "$swscale_h" -a $ffmpeg_num_version -gt 51403; then
- AC_DEFINE(HAVE_SWSCALE_H, 1, [Define if swscale.h is found])
+ AC_MSG_CHECKING([for avformat.h])
+ avformat_h=`echo ${ac_cv_path_ffmpeg_incl} | sed 's/-I//'`
+ if test -f "${avformat_h}/ffmpeg/avformat.h"; then
+ AC_DEFINE(HAVE_FFMPEG_AVFORMAT_H, 1, [Define if avformat.h is found])
+ avformat_h="${avformat_h}/ffmpeg/avformat.h"
+ else
+ if test -f "${avformat_h}/libavformat/avformat.h"; then
+ AC_DEFINE(HAVE_LIBAVFORMAT_AVFORMAT_H, 1, [Define if avformat.h is
found])
+ avformat_h="${avformat_h}/libavformat/avformat.h"
+ else
+ avformat_h=""
+ fi
+ fi
+ AC_MSG_RESULT($avformat_h)
+
+ dnl look for swscale.h, but ignore versions older than 51.40.3
+ if test $ffmpeg_num_version -gt 51403; then
+ swscale_h=`echo ${ac_cv_path_ffmpeg_incl} | sed 's/-I//'`
+ if test -f "${swscale_h}/ffmpeg/swscale.h"; then
+ AC_DEFINE(HAVE_FFMPEG_SWSCALE_H, 1, [Define if swscale.h is found])
+ fi
+ if test -f "${swscale_h}/libswscale/swscale.h"; then
+ AC_DEFINE(HAVE_LIBSWSCALE_SWSCALE_H, 1, [Define if swscale.h is found])
fi
fi
Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- server/asobj/NetStreamFfmpeg.h 22 May 2008 11:30:17 -0000 1.67
+++ server/asobj/NetStreamFfmpeg.h 23 May 2008 05:58:09 -0000 1.68
@@ -38,9 +38,17 @@
#include "impl.h"
+#ifdef HAVE_FFMPEG_AVFORMAT_H
extern "C" {
#include <ffmpeg/avformat.h>
}
+#endif
+
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#endif
#include "image.h"
#include "StreamProvider.h"
Index: server/asobj/SoundFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/SoundFfmpeg.h 26 Mar 2008 21:34:22 -0000 1.14
+++ server/asobj/SoundFfmpeg.h 23 May 2008 05:58:09 -0000 1.15
@@ -32,9 +32,17 @@
// TODO: use a global define for disabling all threads at once
#define LOADS_IN_SEPARATE_THREAD
+#ifdef HAVE_FFMPEG_AVFORMAT_H
extern "C" {
#include <ffmpeg/avformat.h>
}
+#endif
+
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#endif
namespace gnash {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog configure.ac gui/gnash.cpp gui/...,
Russ Nelson <=