Merge from 1.1

4 files changed, 27 insertions, 9 deletions

diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 4a0fd57dc..ca3e488fa 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -143,12 +143,20 @@ struct ff_video_decoder_s {
 static void ff_check_colorspace (ff_video_decoder_t *this) {
   int i, cm;
 
+#ifdef AVCODEC_HAS_COLORSPACE
   cm = this->context->colorspace << 1;
+#else
+  cm = 0;
+#endif
+
   /* ffmpeg bug: color_range not set by svq3 decoder */
   i = this->context->pix_fmt;
-  if (cm && ((i == PIX_FMT_YUVJ420P) || (i == PIX_FMT_YUVJ444P) ||
-    (this->context->color_range == AVCOL_RANGE_JPEG)))
+  if (cm && ((i == PIX_FMT_YUVJ420P) || (i == PIX_FMT_YUVJ444P)))
+    cm |= 1;
+#ifdef AVCODEC_HAS_COLORSPACE
+  if (this->context->color_range == AVCOL_RANGE_JPEG)
     cm |= 1;
+#endif
 
   /* report changes of colorspyce and/or color range */
   if (cm != this->color_matrix) {
@@ -460,9 +468,10 @@ static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type)
       break;
   }
 
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
   /* dont want initial AV_NOPTS_VALUE here */
   this->context->reordered_opaque = 0;
-
+#endif
 }
 
 static void choose_speed_over_accuracy_cb(void *user_data, xine_cfg_entry_t *entry) {
diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
index 69b9aa30e..f025dfec6 100644
--- a/src/combined/ffmpeg/ffmpeg_compat.h
+++ b/src/combined/ffmpeg/ffmpeg_compat.h
@@ -24,10 +24,14 @@
 #define XINE_AVCODEC_COMPAT_H
 
 #ifndef LIBAVCODEC_VERSION_MAJOR
-#  error ffmpeg headers must be included first !
+#  ifdef LIBAVCODEC_VERSION_INT
+#    define LIBAVCODEC_VERSION_MAJOR ((LIBAVCODEC_VERSION_INT)>>16)
+#    define LIBAVCODEC_VERSION_MINOR (((LIBAVCODEC_VERSION_INT)>>8) & 0xff)
+#  else
+#    error ffmpeg headers must be included first !
+#  endif
 #endif
 
-
 #if LIBAVCODEC_VERSION_MAJOR > 51
 #  define bits_per_sample bits_per_coded_sample
 #endif
@@ -44,6 +48,11 @@
 # undef AVCODEC_HAS_REORDERED_OPAQUE
 #endif
 
+/* colorspace and color_range were added before 52.29.0 */
+#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 29)
+# define AVCODEC_HAS_COLORSPACE
+#endif
+
 /**/
 #if LIBAVCODEC_VERSION_MAJOR > 53 || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR >= 8)
 #  define avcodec_init() do {} while(0)
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 616da19a5..f7a932096 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = lrb.c lrb.h accel_vdpau.h accel_xvmc.h
 
 if WIN32
 DEF_FILE = libxine-$(XINE_MAJOR).def
-def_ldflags=-Wl,--output-def,$(DEF_FILE) $(LDFLAGS_NOUNDEFINED)
+def_ldflags=-Wl,--output-def,$(DEF_FILE)
 else
 DEF_FILE =
 endif
@@ -45,7 +45,7 @@ libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS)
                     $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(XDG_BASEDIR_LIBS) \
                     $(AVUTIL_LIBS)
 
-libxine_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) $(GCSECTIONS) \
+libxine_la_LDFLAGS = $(LDFLAGS_NOUNDEFINED) $(AM_LDFLAGS) $(def_ldflags) $(GCSECTIONS) \
 	-weak libxine-interface.la \
 	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
 
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index e2aac22f5..1ca5f4d47 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -41,6 +41,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include <sys/socket.h>
 
 #if HAVE_EXECINFO_H
@@ -55,8 +56,7 @@
 #include <langinfo.h>
 #endif
 
-#if defined(__CYGWIN__) || defined(WIN32)
-#include <ctype.h>
+#if defined(WIN32)
 #include <windows.h>
 #endif