Origin: upstream, other, *
Description: Applied patches. See Vcs-* headers in debian/control.

--- xine-lib-1.1.18.1.orig/configure
+++ xine-lib-1.1.18.1/configure
@@ -25795,7 +25795,7 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -25852,7 +25852,7 @@ fi
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 
 int
@@ -25881,6 +25881,18 @@ $as_echo "yes" >&6; }
 
 $as_echo "#define HAVE_DVDNAV 1" >>confdefs.h
 
+              for ac_header in dvdread/nav_types.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dvdread/nav_types.h" "ac_cv_header_dvdread_nav_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_dvdread_nav_types_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DVDREAD_NAV_TYPES_H 1
+_ACEOF
+
+fi
+
+done
+
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -25899,7 +25911,7 @@ $as_echo "no" >&6; }
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 
 int
--- xine-lib-1.1.18.1.orig/src/input/input_dvd.c
+++ xine-lib-1.1.18.1/src/input/input_dvd.c
@@ -79,7 +79,13 @@
 /* DVDNAV includes */
 #ifdef HAVE_DVDNAV
 #  include <dvdnav/dvdnav.h>
-#  include <dvdnav/nav_read.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  define DVDNAV_COMPILE
 #  include "dvdnav.h"
--- xine-lib-1.1.18.1.orig/src/combined/ffmpeg/ff_video_decoder.c
+++ xine-lib-1.1.18.1/src/combined/ffmpeg/ff_video_decoder.c
@@ -309,11 +309,6 @@ static void init_video_codec (ff_video_d
 
   lprintf("lavc decoder found\n");
 
-  /* force (width % 8 == 0), otherwise there will be
-   * display problems with Xv.
-   */
-  this->bih.biWidth = (this->bih.biWidth + 1) & (~1);
-
   this->context->width = this->bih.biWidth;
   this->context->height = this->bih.biHeight;
   this->context->stream_codec_tag = this->context->codec_tag =
@@ -1389,7 +1384,7 @@ static void ff_handle_buffer (ff_video_d
 	        (this->context->pix_fmt == PIX_FMT_RGB24) ||
 	        (this->context->pix_fmt == PIX_FMT_PAL8)) {
 	      this->output_format = XINE_IMGFMT_YUY2;
-	      init_yuv_planes(&this->yuv, this->bih.biWidth, this->bih.biHeight);
+	      init_yuv_planes(&this->yuv, (this->bih.biWidth + 15) & ~15, this->bih.biHeight);
 	      this->yuv_init = 1;
 	    }
 	    this->cs_convert_init = 1;
--- xine-lib-1.1.18.1.orig/src/libspudec/spu.c
+++ xine-lib-1.1.18.1/src/libspudec/spu.c
@@ -57,8 +57,13 @@
 #include "buffer.h"
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_read.h>
-#  include <dvdnav/nav_print.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_read.h>
+#    include <dvdnav/nav_print.h>
+#  else
+#    include <dvdread/nav_read.h>
+#    include <dvdread/nav_print.h>
+#  endif
 #else
 #  include "nav_read.h"
 #  include "nav_print.h"
--- xine-lib-1.1.18.1.orig/src/libspudec/spu.h
+++ xine-lib-1.1.18.1/src/libspudec/spu.h
@@ -33,7 +33,11 @@
 #include "video_out.h"
 #include "video_overlay.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_types.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#  else
+#    include <dvdread/nav_types.h>
+#  endif
 #else
 #  include "nav_types.h"
 #endif
--- xine-lib-1.1.18.1.orig/src/libspudec/xine_spu_decoder.c
+++ xine-lib-1.1.18.1/src/libspudec/xine_spu_decoder.c
@@ -39,8 +39,13 @@
 #include "xineutils.h"
 #include "spu.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_read.h>
-#  include <dvdnav/nav_types.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  include "nav_read.h"
 #  include "nav_types.h"
--- xine-lib-1.1.18.1.orig/src/dxr3/dxr3_decode_spu.c
+++ xine-lib-1.1.18.1/src/dxr3/dxr3_decode_spu.c
@@ -51,8 +51,13 @@
 #include "buffer.h"
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_types.h>
-#  include <dvdnav/nav_read.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  include "nav_types.h"
 #  include "nav_read.h"
--- xine-lib-1.1.18.1.orig/m4/dvdnav.m4
+++ xine-lib-1.1.18.1/m4/dvdnav.m4
@@ -84,7 +84,7 @@ dnl checks the results of dvdnav-config 
 dnl
       rm -f conf.dvdnavtest
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -129,7 +129,7 @@ main ()
 ]])],[],[no_dvdnav=yes],[no_dvdnav=cc])
        if test "x$no_dvdnav" = xcc; then
          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 ]], [[ return 0; ]])],[no_dvdnav=''],[no_dvdnav=yes])
        fi
@@ -140,6 +140,8 @@ main ()
     if test "x$no_dvdnav" = x ; then
        AC_MSG_RESULT(yes)
        ifelse([$2], , :, [$2])
+       dnl nav_*.h seem to have been moved from dvdnav at some point?
+       AC_CHECK_HEADERS([dvdread/nav_types.h])
     else
       AC_MSG_RESULT(no)
       if test "$DVDNAV_CONFIG" = "no" ; then
@@ -155,7 +157,7 @@ main ()
           CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
           LIBS="$LIBS $DVDNAV_LIBS"
           AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 ]], [[ return 0; ]])],
         [ echo "*** The test program compiled, but did not run. This usually means"
