| @@ -1,7 +1,7 @@
-diff -ur vlc-0.8.6c.orig/configure vlc-0.8.6c/configure
---- vlc-0.8.6c.orig/configure 2007-06-16 16:25:49.000000000 +0200
-+++ vlc-0.8.6c/configure 2007-09-01 17:46:05.405817018 +0200
-@@ -44381,12 +44381,12 @@
+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" && \
@@ -17,7 +17,7 @@
else
pkg_failed=yes
fi
-@@ -44399,12 +44399,12 @@
+@@ -44681,12 +44681,12 @@
pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
else
if test -n "$PKG_CONFIG" && \
@@ -33,7 +33,7 @@
else
pkg_failed=yes
fi
-@@ -44423,9 +44423,9 @@
+@@ -44705,9 +44705,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -45,7 +45,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$FFMPEG_PKG_ERRORS" >&5
-@@ -45084,7 +45084,7 @@
+@@ -45366,7 +45366,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -54,7 +54,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45146,7 +45146,7 @@
+@@ -45428,7 +45428,7 @@
for element in ffmpeg; do
@@ -63,7 +63,7 @@
am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
done
-@@ -45245,7 +45245,7 @@
+@@ -45527,7 +45527,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -72,7 +72,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -45966,7 +45966,7 @@
+@@ -46248,7 +46248,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -81,7 +81,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46028,7 +46028,7 @@
+@@ -46310,7 +46310,7 @@
for element in ffmpeg; do
@@ -90,7 +90,7 @@
am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
done
-@@ -46127,7 +46127,7 @@
+@@ -46409,7 +46409,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -99,7 +99,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -46924,7 +46924,7 @@
+@@ -47206,7 +47206,7 @@
for element in ffmpegaltivec; do
@@ -108,11 +108,10 @@
am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
done
-Nur in vlc-0.8.6c: configure~.
-diff -ur vlc-0.8.6c.orig/configure.ac vlc-0.8.6c/configure.ac
---- vlc-0.8.6c.orig/configure.ac 2007-06-16 16:25:19.000000000 +0200
-+++ vlc-0.8.6c/configure.ac 2007-09-01 17:46:51.504698018 +0200
-@@ -2695,7 +2695,7 @@
+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
@@ -121,7 +120,7 @@
[
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
-@@ -2737,7 +2737,7 @@
+@@ -2735,7 +2735,7 @@
AC_CHECK_LIB(avcodec, avcodec_init, [
VLC_ADD_BUILTINS([ffmpeg])
@@ -130,7 +129,7 @@
if test "${enable_sout}" != "no"; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi],
-@@ -2750,7 +2750,7 @@
+@@ -2748,7 +2748,7 @@
[$LDAVUTIL])
AC_CHECK_LIB(avformat, av_open_input_stream, [
@@ -139,7 +138,7 @@
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
])
-@@ -2786,13 +2786,13 @@
+@@ -2784,13 +2784,13 @@
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a)
VLC_ADD_BUILTINS([ffmpegaltivec])
@@ -155,10 +154,9 @@
VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavformat])
fi
VLC_ADD_LDFLAGS([stream_out_switcher],[-L${real_ffmpeg_tree}/libavcodec])
-Nur in vlc-0.8.6c: configure.ac~.
-diff -ur vlc-0.8.6c.orig/modules/codec/ffmpeg/chroma.c vlc-0.8.6c/modules/codec/ffmpeg/chroma.c
---- vlc-0.8.6c.orig/modules/codec/ffmpeg/chroma.c 2007-06-16 16:25:12.000000000 +0200
-+++ vlc-0.8.6c/modules/codec/ffmpeg/chroma.c 2007-09-01 14:51:58.228909268 +0200
+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
@@ -289,10 +287,21 @@
+ */
free( p_vout->chroma.p_sys );
}
-Nur in vlc-0.8.6c/modules/codec/ffmpeg: chroma.c~.
-diff -ur vlc-0.8.6c.orig/modules/codec/ffmpeg/video.c vlc-0.8.6c/modules/codec/ffmpeg/video.c
---- vlc-0.8.6c.orig/modules/codec/ffmpeg/video.c 2007-06-16 16:25:12.000000000 +0200
-+++ vlc-0.8.6c/modules/codec/ffmpeg/video.c 2007-09-01 16:47:53.335576268 +0200
+diff -ur vlc-0.8.6d.orig/modules/codec/ffmpeg/mux.c vlc-0.8.6d/modules/codec/ffmpeg/mux.c
+--- vlc-0.8.6d.orig/modules/codec/ffmpeg/mux.c 2007-11-26 14:08:07.000000000 +0100
++++ vlc-0.8.6d/modules/codec/ffmpeg/mux.c 2007-12-20 17:16:55.000000000 +0100
+@@ -133,7 +133,7 @@
+ return VLC_EGENERIC;
+ }
+
+- p_sys->oc->pb = p_sys->io;
++ p_sys->oc->pb = &p_sys->io;
+ p_sys->oc->nb_streams = 0;
+
+ p_sys->b_write_header = VLC_TRUE;
+diff -ur vlc-0.8.6d.orig/modules/codec/ffmpeg/video.c vlc-0.8.6d/modules/codec/ffmpeg/video.c
+--- vlc-0.8.6d.orig/modules/codec/ffmpeg/video.c 2007-11-26 14:08:07.000000000 +0100
++++ vlc-0.8.6d/modules/codec/ffmpeg/video.c 2007-12-20 16:36:21.986438293 +0100
@@ -37,6 +37,7 @@
#endif
@@ -326,10 +335,9 @@
break;
default:
msg_Err( p_dec, "don't know how to convert chroma %i",
-Nur in vlc-0.8.6c/modules/codec/ffmpeg: video.c~.
-diff -ur vlc-0.8.6c.orig/modules/codec/ffmpeg/video_filter.c vlc-0.8.6c/modules/codec/ffmpeg/video_filter.c
---- vlc-0.8.6c.orig/modules/codec/ffmpeg/video_filter.c 2007-06-16 16:25:12.000000000 +0200
-+++ vlc-0.8.6c/modules/codec/ffmpeg/video_filter.c 2007-09-01 16:30:14.000000000 +0200
+diff -ur vlc-0.8.6d.orig/modules/codec/ffmpeg/video_filter.c vlc-0.8.6d/modules/codec/ffmpeg/video_filter.c
+--- vlc-0.8.6d.orig/modules/codec/ffmpeg/video_filter.c 2007-11-26 14:08:07.000000000 +0100
++++ vlc-0.8.6d/modules/codec/ffmpeg/video_filter.c 2007-12-20 16:36:22.486421701 +0100
@@ -37,6 +37,7 @@
#endif
@@ -512,4 +520,3 @@
if (p_sys->b_enable_croppadd)
{
-Nur in vlc-0.8.6c/modules/codec/ffmpeg: video_filter.c~.
|
