CODENAME="Twoflower"
COPYRIGHT_YEARS="1996-2010"
-AC_PREREQ(2.59c)
AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
AC_CONFIG_MACRO_DIR(m4)
AM_CONFIG_HEADER(config.h)
# Disable with "./configure --disable-silent-rules" or "make V=1"
-m4_ifdef([AM_SILENT_RULES], [
- AM_SILENT_RULES([yes])
-], [
- AM_DEFAULT_VERBOSITY=1
- AC_SUBST(AM_DEFAULT_VERBOSITY)
-])
-
+AM_SILENT_RULES([yes])
dnl Too many people are not aware of maintainer mode:
dnl If you want to use it, you definitely know what you are doing, so
dnl
AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
-if test "${enable_avcodec}" != "no"
-then
+AS_IF([test "${enable_avcodec}" != "no"], [
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil],
[
VLC_SAVE_FLAGS
],[
AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
])
-fi
+], [
+ have_avcodec="no"
+])
dnl
dnl libva needs avcodec
dnl
AC_ARG_ENABLE(avformat,
-[ --enable-avformat libavformat containers (default enabled)])
+[ --enable-avformat libavformat containers (default enabled)],, [
+ enable_avformat="${have_avcodec}"
+])
if test "${enable_avformat}" != "no"
then
PKG_CHECK_MODULES(AVFORMAT,[libavformat > 52.30.0 libavutil],
enum {
VOUT_WINDOW_TYPE_XID,
VOUT_WINDOW_TYPE_HWND,
+ VOUT_WINDOW_TYPE_NSOBJECT,
};
/**
* It must be filled in the open function.
*/
union {
- void *hwnd; /* Win32 window handle */
- uint32_t xid; /* X11 windows ID */
+ void *hwnd; /* Win32 window handle */
+ uint32_t xid; /* X11 windows ID */
+ void *nsobject; /* Mac OSX view object */
} handle;
/* display server (mandatory) */
#include <glib.h>
#include <glib/gstdio.h>
#include <glib-object.h> /* g_object_unref( ) */
-#include <librsvg-2/librsvg/rsvg.h>
+#include <librsvg/rsvg.h>
typedef struct svg_rendition_t svg_rendition_t;
type = "vout window hwnd";
window->handle.hwnd = NULL;
break;
+#endif
+#ifdef __APPLE__
+ case VOUT_WINDOW_TYPE_NSOBJECT:
+ type = "vout window nsobject";
+ window->handle.nsobject = NULL;
+ break;
#endif
case VOUT_WINDOW_TYPE_XID:
type = "vout window xid";