| @@ -1,522 +0,0 @@
-diff -ur vlc-0.8.6d.orig/configure vlc-0.8.6d/configure
---- vlc-0.8.6d.orig/configure 2007-11-27 20:22:58.000000000 +0100
-+++ vlc-0.8.6d/configure 2007-12-20 16:36:21.986438293 +0100
-@@ -44663,12 +44663,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
-@@ -44681,12 +44681,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
-@@ -44705,9 +44705,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
-@@ -45366,7 +45366,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
-@@ -45428,7 +45428,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
-
-@@ -45527,7 +45527,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
-@@ -46248,7 +46248,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
-@@ -46310,7 +46310,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
-
-@@ -46409,7 +46409,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
-@@ -47206,7 +47206,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.6d.orig/configure.ac vlc-0.8.6d/configure.ac
---- vlc-0.8.6d.orig/configure.ac 2007-11-27 14:11:35.000000000 +0100
-+++ vlc-0.8.6d/configure.ac 2007-12-20 16:36:21.986438293 +0100
-@@ -2693,7 +2693,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)
-@@ -2735,7 +2735,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],
-@@ -2748,7 +2748,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}"
- ])
-@@ -2784,13 +2784,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.6d.orig/modules/codec/ffmpeg/chroma.c vlc-0.8.6d/modules/codec/ffmpeg/chroma.c
---- vlc-0.8.6d.orig/modules/codec/ffmpeg/chroma.c 2007-11-26 14:08:07.000000000 +0100
-+++ vlc-0.8.6d/modules/codec/ffmpeg/chroma.c 2007-12-20 16:36:21.986438293 +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 =
|
