Merge branch 'master' of git://git.videolan.org/vlc

diff --combined configure.ac
index 8fa684aab396e022c211ad9d6853289dcab4d596,f3c4f073ecfa0c6aa955126cd22ae16b6c5fcb99..71189e2d2abbb87838ace618033609185494da5f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1739,11 -1739,11 +1739,11 @@@ if test "${enable_live555}" != "no"; th
      CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
  
      AC_CHECK_HEADERS(liveMedia_version.hh, [
-       AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+       AC_MSG_CHECKING(for liveMedia version >= 1275091200 )
        AC_EGREP_CPP(yes,
          [#include <liveMedia_version.hh>
           #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
-          #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+          #if LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200
           yes
           #endif
           #endif],
@@@ -1792,11 -1792,11 +1792,11 @@@ lternatively you can use --disable-live
        AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
  
        AC_CHECK_HEADERS(${real_live555_tree}/liveMedia/include/liveMedia_version.hh,[
-         AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+         AC_MSG_CHECKING(for liveMedia version >= 1275091200 )
          AC_EGREP_CPP(yes,
            [#include "${real_live555_tree}/liveMedia/include/liveMedia_version.hh"
             #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
-            #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+            #if LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200
             yes
             #endif
             #endif],
@@@ -2133,29 -2133,6 +2133,29 @@@ the
    fi
  fi
  
 +dnl
 +dnl special access module for Blackmagic SDI cards
 +dnl
 +AC_ARG_ENABLE(decklink,
 +  [  --enable-decklink       Blackmagic DeckLink SDI access module (default enabled)])
 +if test "${enable_decklink}" != "no"
 +then
 +  AC_ARG_WITH(decklink_sdk,
 +    [  --with-decklink-sdk=DIR      Location of Blackmagic DeckLink SDI SDK],[],[])
 +  if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}"
 +  then
 +    VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include])
 +  fi
 +  CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_decklink}"
 +  AC_LANG_PUSH(C++)
 +  AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [
 +    VLC_ADD_PLUGIN([decklink])
 +  ],[AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)])
 +  AC_LANG_POP(C++)
 +  CPPFLAGS="${CPPFLAGS_save}"
 +fi
 +
 +
  dnl
  dnl  gnomeVFS access module
  dnl