diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
| commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
| tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /configure | |
| parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
| parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
| download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz | |
Merge svn changes up to r27899
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4179,11 +4179,11 @@ echocheck "OpenGL" #Note: this test is run even with --enable-gl since we autodetect linker flags if (test "$_x11" = yes || win32) && test "$_gl" != no ; then cat > $TMPC << EOF -#include <GL/gl.h> #ifdef GL_WIN32 #include <windows.h> -#include <GL/glext.h> +#include <GL/gl.h> #else +#include <GL/gl.h> #include <X11/Xlib.h> #include <GL/glx.h> #endif @@ -5785,7 +5785,7 @@ if test "$_zlib" = yes ; then _ld_extra="$_ld_extra -lz" else _def_zlib='#undef CONFIG_ZLIB' - _libavdecoders=`echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/DXA_DECODER// ` + _libavdecoders=`echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/DXA_DECODER// -e/TSCC_DECODER// ` _libavencoders=`echo $_libavencoders | sed -e s/FLASHSV_ENCODER// -e s/PNG_ENCODER// -e s/ZMBV_ENCODER// ` fi echores "$_zlib" |