summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-18 03:55:27 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-18 03:55:27 +0000
commit6f8427e09a1971f53d60ead4bfb84235ef39cf8f (patch)
tree84a22d47f470f92a1868cf6e7a7feae836aac571
parent4f51630962235c9ad86ca5a907f1aa7dd1215024 (diff)
downloadmpv-6f8427e09a1971f53d60ead4bfb84235ef39cf8f.tar.bz2
mpv-6f8427e09a1971f53d60ead4bfb84235ef39cf8f.tar.xz
Move x264 version check into configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14723 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure3
-rw-r--r--libmpcodecs/ve_x264.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/configure b/configure
index 5316623b3c..d90aec7fdf 100755
--- a/configure
+++ b/configure
@@ -5906,6 +5906,9 @@ cat > $TMPC << EOF
#include <stdint.h>
#include <stdarg.h>
#include <x264.h>
+#if X264_BUILD < 0x0010
+#error We do not support old versions of x264. Get the latest from SVN.
+#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
EOF
_ld_x264="$_ld_x264 -lx264 $_ld_lm"
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index bbf6aa6372..674f4ba8a3 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -49,10 +49,6 @@
#include <x264.h>
-#if X264_BUILD < 0x0010
-#error We do not support old versions of x264. Get the latest from SVN.
-#endif
-
typedef struct _h264_module_t {
muxer_stream_t *mux;
x264_param_t param;