]>
Commit | Line | Data |
---|---|---|
ec7f639a KK |
1 | --- xbmc-12.3-Frodo/configure.in.orig 2013-12-12 22:47:49.000000000 +0100 |
2 | +++ xbmc-12.3-Frodo/configure.in 2014-01-03 22:57:57.000000000 +0100 | |
3 | @@ -1573,15 +1573,6 @@ | |
4 | USE_EXTERNAL_FFMPEG=1 | |
5 | AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.]) | |
6 | ||
7 | - # Disable vdpau support if external libavcodec doesn't have it | |
8 | - AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],, | |
9 | - [if test "x$use_vdpau" = "xyes"; then | |
10 | - AC_MSG_ERROR($ffmpeg_vdpau_not_supported) | |
11 | - else | |
12 | - use_vdpau=no | |
13 | - AC_MSG_RESULT($ffmpeg_vdpau_not_supported) | |
14 | - fi]) | |
15 | - | |
16 | # Check for 'PIX_FMT_VDPAU_MPEG4' from libavutil | |
17 | if test "x$use_vdpau" != "xno"; then | |
18 | AC_LANG_PUSH([C++]) | |
19 | @@ -2539,7 +2530,7 @@ | |
20 | # extra-cflags must be passed alone or it gets expanded wrong by the ffmpeg configure | |
21 | FFMPEG_EXTRACFLAGS="$CFLAGS $FFMPEG_EXTRACFLAGS -w -D_DARWIN_C_SOURCE -Dattribute_deprecated=" | |
22 | ||
23 | - ./configure --extra-cflags="$FFMPEG_EXTRACFLAGS" $ffmpg_config --as="$AS" | |
24 | + LDFLAGS="$LDFLAGS" ./configure --extra-cflags="$FFMPEG_EXTRACFLAGS" $ffmpg_config --as="$AS" | |
25 | ||
26 | # if using llvm-gcc-4.2 as assembler, -MMD is not enough to generate | |
27 | # dependency files in the right place, replace it with something that works |