| @@ -0,0 +1,57 @@
+diff -urN vlc-0.8.6d/modules/access/cdda/access.c vlc-0.8.6d.cdda/modules/access/cdda/access.c
+--- vlc-0.8.6d/modules/access/cdda/access.c 2007-11-26 15:08:06.000000000 +0200
++++ vlc-0.8.6d.cdda/modules/access/cdda/access.c 2008-01-21 21:47:22.000000000 +0200
+@@ -737,14 +737,14 @@
+
+ char *psz_paranoia = config_GetPsz( p_access,
+ MODULE_STRING "-paranoia" );
+- p_cdda->e_paranoia = paranoia_none;
++ p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
+ if( psz_paranoia && *psz_paranoia )
+ {
+
+ if( !strncmp( psz_paranoia, "full", strlen("full") ) )
+- p_cdda->e_paranoia = paranoia_full;
++ p_cdda->e_paranoia = PARANOIA_MODE_FULL;
+ else if( !strncmp( psz_paranoia, "overlap", strlen("overlap") ) )
+- p_cdda->e_paranoia = paranoia_overlap;
++ p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP;
+
+ /* Use CD Paranoia? */
+ if ( p_cdda->e_paranoia ) {
+@@ -755,7 +755,7 @@
+ if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) {
+ msg_Warn( p_cdda_input, "unable to get paranoia support - "
+ "continuing without it." );
+- p_cdda->e_paranoia = paranoia_none;
++ p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
+ } else {
+ p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd);
+ cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
+@@ -763,7 +763,7 @@
+ /* Set reading mode for full or overlap paranoia,
+ but allow skipping sectors. */
+ cdio_paranoia_modeset(p_cdda->paranoia,
+- paranoia_full == p_cdda->e_paranoia ?
++ PARANOIA_MODE_FULL == p_cdda->e_paranoia ?
+ PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP :
+ PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP
+ );
+diff -urN vlc-0.8.6d/modules/access/cdda/cdda.h vlc-0.8.6d.cdda/modules/access/cdda/cdda.h
+--- vlc-0.8.6d/modules/access/cdda/cdda.h 2007-11-26 15:08:06.000000000 +0200
++++ vlc-0.8.6d.cdda/modules/access/cdda/cdda.h 2008-01-21 21:47:22.000000000 +0200
+@@ -71,12 +71,13 @@
+ #define CdIo_t CdIo
+ #endif
+
++#if LIBCDIO_VERSION_NUM < 78
+ typedef enum {
+ paranoia_none = 0, /* Note: We make use of 0 as being the same as false */
+ paranoia_overlap = 1,
+ paranoia_full = 2
+ } paranoia_mode_t;
+-
++#endif
+
+ /*****************************************************************************
+ * cdda_data_t: CD audio information
|
| @@ -0,0 +1,522 @@
+diff -ur vlc-0.8.6e.orig/configure vlc-0.8.6e/configure
+--- vlc-0.8.6e.orig/configure 2008-02-24 20:07:09.000000000 +0100
++++ vlc-0.8.6e/configure 2008-03-15 13:59:28.082407135 +0100
+@@ -45043,12 +45043,12 @@
+ pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec, libavformat\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libavcodec, libavformat") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec, libavformat, libswscale\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libavcodec, libavformat, libswscale") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec, libavformat" 2>/dev/null`
++ pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec, libavformat, libswscale" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -45061,12 +45061,12 @@
+ pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec, libavformat\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libavcodec, libavformat") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libavcodec, libavformat, libswscale\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libavcodec, libavformat, libswscale") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec, libavformat" 2>/dev/null`
++ pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec, libavformat, libswscale" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -45085,9 +45085,9 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libavcodec, libavformat"`
++ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libavcodec, libavformat, libswscale"`
+ else
+- FFMPEG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libavcodec, libavformat"`
++ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libavcodec, libavformat, libswscale"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FFMPEG_PKG_ERRORS" >&5
+@@ -45746,7 +45746,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lavcodec $LDAVUTIL $LIBS"
++LIBS="-lavcodec -lswscale $LDAVUTIL $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -45808,7 +45808,7 @@
+
+
+ for element in ffmpeg; do
+- eval "LDFLAGS_${element}="'"'"-lavcodec "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-lavcodec -lswscale "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -45907,7 +45907,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lavformat -lavcodec -lz $LDAVUTIL $LIBS"
++LIBS="-lavformat -lavcodec -lswscale -lz $LDAVUTIL $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46628,7 +46628,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lavcodec $LDAVUTIL $LIBS"
++LIBS="-lavcodec -lswscale $LDAVUTIL $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -46690,7 +46690,7 @@
+
+
+ for element in ffmpeg; do
+- eval "LDFLAGS_${element}="'"'"-lavcodec "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-lavcodec -lswscale "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -46789,7 +46789,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lavformat -lavcodec -lz $LDAVUTIL $LIBS"
++LIBS="-lavformat -lavcodec -lswscale -lz $LDAVUTIL $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -47586,7 +47586,7 @@
+
+
+ for element in ffmpegaltivec; do
+- eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec -lswscale "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+diff -ur vlc-0.8.6e.orig/configure.ac vlc-0.8.6e/configure.ac
+--- vlc-0.8.6e.orig/configure.ac 2008-02-24 20:01:55.000000000 +0100
++++ vlc-0.8.6e/configure.ac 2008-03-15 13:59:28.082407135 +0100
+@@ -2694,7 +2694,7 @@
+ else
+
+ dnl Trying with pkg-config
+- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
++ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libswscale],
+ [
+ AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
+ AC_CHECK_HEADERS(ffmpeg/avformat.h)
+@@ -2736,7 +2736,7 @@
+
+ AC_CHECK_LIB(avcodec, avcodec_init, [
+ VLC_ADD_BUILTINS([ffmpeg])
+- VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])
++ VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec -lswscale])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_BUILTINS([stream_out_switcher])
+ fi],
+@@ -2749,7 +2749,7 @@
+ [$LDAVUTIL])
+
+ AC_CHECK_LIB(avformat, av_open_input_stream, [
+- VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL])
++ VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lswscale -lz]) ], [], [-lavcodec -lswscale -lz $LDAVUTIL])
+ LDFLAGS="${LDFLAGS_save}"
+ CPPFLAGS="${CPPFLAGS_save}"
+ ])
+@@ -2785,13 +2785,13 @@
+ dnl Use a custom libffmpeg
+ AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a)
+ VLC_ADD_BUILTINS([ffmpegaltivec])
+- VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec])
++ VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec -lswscale])
+ VLC_ADD_CPPFLAGS([ffmpeg],[-DNO_ALTIVEC_IN_FFMPEG])
+ VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
+
+ if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
+ AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.])
+- VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavformat -lavformataltivec -lz])
++ VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavformat -lavformataltivec -lswscale -lz])
+ VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavformat])
+ fi
+ VLC_ADD_LDFLAGS([stream_out_switcher],[-L${real_ffmpeg_tree}/libavcodec])
+diff -ur vlc-0.8.6e.orig/modules/codec/ffmpeg/chroma.c vlc-0.8.6e/modules/codec/ffmpeg/chroma.c
+--- vlc-0.8.6e.orig/modules/codec/ffmpeg/chroma.c 2007-11-21 23:23:29.000000000 +0100
++++ vlc-0.8.6e/modules/codec/ffmpeg/chroma.c 2008-03-15 13:59:28.082407135 +0100
+@@ -35,6 +35,7 @@
+ #endif
+
+ #include "ffmpeg.h"
++#include <ffmpeg/swscale.h>
+
+ void E_(InitLibavcodec) ( vlc_object_t *p_object );
+ static void ChromaConversion( vout_thread_t *, picture_t *, picture_t * );
+@@ -89,26 +90,27 @@
+ p_vout->chroma.p_sys->i_src_ffmpeg_chroma = i_ffmpeg_chroma[0];
+ p_vout->chroma.p_sys->i_dst_ffmpeg_chroma = i_ffmpeg_chroma[1];
+
+- if( ( p_vout->render.i_height != p_vout->output.i_height ||
+- p_vout->render.i_width != p_vout->output.i_width ) &&
+- ( p_vout->chroma.p_sys->i_dst_vlc_chroma == VLC_FOURCC('I','4','2','0') ||
+- p_vout->chroma.p_sys->i_dst_vlc_chroma == VLC_FOURCC('Y','V','1','2') ))
+-
+- {
+- msg_Dbg( p_vout, "preparing to resample picture" );
+- p_vout->chroma.p_sys->p_rsc =
+- img_resample_init( p_vout->output.i_width, p_vout->output.i_height,
+- p_vout->render.i_width, p_vout->render.i_height );
+- avpicture_alloc( &p_vout->chroma.p_sys->tmp_pic,
+- p_vout->chroma.p_sys->i_dst_ffmpeg_chroma,
+- p_vout->render.i_width, p_vout->render.i_height );
+- }
+- else
+- {
+- msg_Dbg( p_vout, "no resampling" );
+- p_vout->chroma.p_sys->p_rsc = NULL;
+- }
+-
++ /* if( ( p_vout->render.i_height != p_vout->output.i_height ||
++ * p_vout->render.i_width != p_vout->output.i_width ) &&
++ * ( p_vout->chroma.p_sys->i_dst_vlc_chroma == VLC_FOURCC('I','4','2','0') ||
++ * p_vout->chroma.p_sys->i_dst_vlc_chroma == VLC_FOURCC('Y','V','1','2') ))
++ *
++ * {
++ *msg_Dbg( p_vout, "preparing to resample picture" );
++ * p_vout->chroma.p_sys->p_rsc =
|
