diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-09-23 02:10:45 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-09-23 02:10:45 +0100 |
| commit | e17ae210c7f5f06c4c79efd5f35d6ebad36aa651 (patch) | |
| tree | 2984139d2bb2cbbba923e629cf2d0fd3439be8a7 | |
| parent | 7360581b96550b66824053a9fc8903602a4db7a8 (diff) | |
| parent | 11c825b340cc7ac470e32b992aa64cf3ec50b4ce (diff) | |
| download | xine-lib-e17ae210c7f5f06c4c79efd5f35d6ebad36aa651.tar.gz xine-lib-e17ae210c7f5f06c4c79efd5f35d6ebad36aa651.tar.bz2 | |
Merge from 1.1.
| -rw-r--r-- | m4/directx.m4 | 2 | ||||
| -rw-r--r-- | src/libmpeg2/decode.c | 2 | ||||
| -rw-r--r-- | src/libreal/real_common.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/m4/directx.m4 b/m4/directx.m4 index 4417023ee..61b241c0f 100644 --- a/m4/directx.m4 +++ b/m4/directx.m4 @@ -28,7 +28,7 @@ AC_DEFUN([AM_PATH_DIRECTX], [ #include <windows.h> #include <ddraw.h> #include <dsound.h>]], - [[DirectDrawCreate(0, NULL, 0); DirectsoundCreate(0, NULL, 0)]])], + [[DirectDrawCreate(0, NULL, 0); DirectSoundCreate(0, NULL, 0)]])], [have_directx=yes], [have_directx=no]) CPPFLAGS="$ac_save_CPPFLAGS" LIBS="$ac_save_LIBS" diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index 2b2426950..58f34ccbc 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -484,7 +484,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, /* from the decoder to report the AFD change in display order and not */ /* in decoding order like it happens below for now. */ _x_stream_info_set(mpeg2dec->stream, XINE_STREAM_INFO_VIDEO_AFD, mpeg2dec->afd_value_seen); -fprintf(stderr, "AFD changed from %d to %d\n", mpeg2dec->afd_value_reported, mpeg2dec->afd_value_seen); + lprintf ("AFD changed from %d to %d\n", mpeg2dec->afd_value_reported, mpeg2dec->afd_value_seen); mpeg2dec->afd_value_reported = mpeg2dec->afd_value_seen; } diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c index e2a4ee3d6..82a947e7c 100644 --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.c @@ -89,6 +89,8 @@ void _x_real_codecs_init(xine_t *const xine) { /* The priority is for the first found */ try_real_subpath("lib/win32") else try_real_subpath("lib/codecs") + else try_real_subpath("lib/real") + else try_real_subpath("lib/RealPlayer10GOLD/codecs") else try_real_subpath("lib64/RealPlayer10/codecs") else try_real_subpath("lib/RealPlayer10/codecs") else try_real_subpath("lib64/RealPlayer9/users/Real/Codecs") |