diff -Nur --exclude po vlc-0.8.6d/aclocal.m4 vlc-0.8.6e/aclocal.m4 --- vlc-0.8.6d/aclocal.m4 2007-11-28 06:22:48.000000000 +1100 +++ vlc-0.8.6e/aclocal.m4 2008-02-25 06:06:59.000000000 +1100 @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL +# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -101,7 +101,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl - AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR @@ -203,6 +202,8 @@ ;; esac +_LT_REQUIRED_DARWIN_CHECKS + AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) @@ -282,9 +283,80 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* ])# _LT_LINKER_BOILERPLATE +# _LT_REQUIRED_DARWIN_CHECKS +# -------------------------- +# Check for some things on darwin +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in + rhapsody* | darwin1.[[0123]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac +]) # _LT_AC_SYS_LIBPATH_AIX # ---------------------- @@ -609,7 +681,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -702,7 +778,7 @@ $2=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" ]) @@ -973,7 +1049,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], @@ -981,7 +1057,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ]) ]) ]) @@ -1298,7 +1374,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[[4-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1831,6 +1907,13 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -2330,7 +2413,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[[4-9]]*) lt_cv_deplibs_check_method=pass_all ;; @@ -2766,7 +2849,7 @@ fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -2823,6 +2906,7 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= # Source file extension for C++ test sources. ac_ext=cpp @@ -2932,7 +3016,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -2945,7 +3029,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -3091,51 +3175,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[[012]]) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -3386,7 +3442,7 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -3821,7 +3877,8 @@ # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +[AC_REQUIRE([LT_AC_PROG_SED])dnl dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each @@ -3946,6 +4003,11 @@ $rm -f confest.$objext +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in @@ -4002,7 +4064,6 @@ ;; esac ]) - case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac @@ -4087,7 +4148,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[[4-9]]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -4264,6 +4325,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ @@ -4326,7 +4388,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4563,6 +4625,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) @@ -4912,7 +4978,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -4969,7 +5035,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -5006,7 +5073,7 @@ esac else case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor @@ -5102,7 +5169,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' @@ -5253,7 +5320,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -5323,7 +5391,8 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) @@ -5460,7 +5529,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -5484,7 +5553,7 @@ # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) @@ -5500,7 +5569,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -5522,6 +5591,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= @@ -5552,12 +5622,14 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) @@ -5607,7 +5679,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -5827,7 +5899,7 @@ fi ;; - aix4* | aix5*) + aix[[4-9]]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -5847,7 +5919,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -6007,11 +6079,10 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) diff -Nur --exclude po vlc-0.8.6d/activex/Makefile.in vlc-0.8.6e/activex/Makefile.in --- vlc-0.8.6d/activex/Makefile.in 2007-11-28 06:23:00.000000000 +1100 +++ vlc-0.8.6e/activex/Makefile.in 2008-02-25 06:07:10.000000000 +1100 @@ -194,6 +194,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -288,6 +289,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/autotools/config.guess vlc-0.8.6e/autotools/config.guess --- vlc-0.8.6d/autotools/config.guess 2007-08-17 13:14:13.000000000 +1000 +++ vlc-0.8.6e/autotools/config.guess 2008-02-18 07:10:30.000000000 +1100 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-07-22' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -532,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -799,6 +799,9 @@ EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -833,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -954,8 +964,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -1474,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be diff -Nur --exclude po vlc-0.8.6d/autotools/config.sub vlc-0.8.6e/autotools/config.sub --- vlc-0.8.6d/autotools/config.sub 2007-08-17 13:14:13.000000000 +1000 +++ vlc-0.8.6e/autotools/config.sub 2008-02-18 07:10:30.000000000 +1100 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2007-06-28' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -813,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1021,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; diff -Nur --exclude po vlc-0.8.6d/autotools/ltmain.sh vlc-0.8.6e/autotools/ltmain.sh --- vlc-0.8.6d/autotools/ltmain.sh 2007-07-12 05:52:34.000000000 +1000 +++ vlc-0.8.6e/autotools/ltmain.sh 2008-02-03 00:28:24.000000000 +1100 @@ -2,7 +2,7 @@ # NOTE: Changing this file will not affect anything until you rerun configure. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2008 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.24 Debian 1.5.24-1" -TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" +VERSION="1.5.26 Debian 1.5.26-1" +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -113,15 +113,21 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +lt_env= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${$lt_var+set}\" = set; then save_$lt_var=\$$lt_var + lt_env=\"$lt_var=\$$lt_var \$lt_env\" $lt_var=C export $lt_var fi" done +if test -n "$lt_env"; then + lt_env="env $lt_env" +fi + # Make sure IFS has a sensible default lt_nl=' ' @@ -485,7 +491,7 @@ echo "\ $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? @@ -788,6 +794,7 @@ *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; + *.sx) xform=sx ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -956,7 +963,7 @@ $run $rm "$lobj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else test -n "$output_obj" && $run $rm $removelist exit $EXIT_FAILURE @@ -1028,7 +1035,7 @@ command="$command$suppress_output" $run $rm "$obj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else $run $rm $removelist exit $EXIT_FAILURE @@ -1161,6 +1168,7 @@ thread_safe=no vinfo= vinfo_number=no + single_module="${wl}-single_module" func_infer_tag $base_compile @@ -1646,6 +1654,11 @@ continue ;; + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + -module) module=yes continue @@ -2152,7 +2165,12 @@ continue fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library lib="$searchdir/lib${name}${search_ext}" @@ -2948,12 +2966,18 @@ # we do not want to link against static libs, # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$path/$depdepl" ; then + if test -f "$deplibdir/$depdepl" ; then + depdepl="$deplibdir/$depdepl" + elif test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" + else + # Can't find it, oh well... + depdepl= fi # do not add paths which are already there case " $newlib_search_path " in @@ -3101,9 +3125,10 @@ case $linkmode in oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 @@ -4245,9 +4270,10 @@ ;; obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 @@ -6486,7 +6512,7 @@ fi # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test \"\${save_$lt_var+set}\" = set; then $lt_var=\$save_$lt_var; export $lt_var diff -Nur --exclude po vlc-0.8.6d/bindings/java/Makefile.in vlc-0.8.6e/bindings/java/Makefile.in --- vlc-0.8.6d/bindings/java/Makefile.in 2007-11-28 06:23:00.000000000 +1100 +++ vlc-0.8.6e/bindings/java/Makefile.in 2008-02-25 06:07:11.000000000 +1100 @@ -132,6 +132,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -226,6 +227,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/bindings/java/src/Makefile.in vlc-0.8.6e/bindings/java/src/Makefile.in --- vlc-0.8.6d/bindings/java/src/Makefile.in 2007-11-28 06:23:01.000000000 +1100 +++ vlc-0.8.6e/bindings/java/src/Makefile.in 2008-02-25 06:07:11.000000000 +1100 @@ -118,6 +118,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -212,6 +213,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/bindings/Makefile.in vlc-0.8.6e/bindings/Makefile.in --- vlc-0.8.6d/bindings/Makefile.in 2007-11-28 06:23:00.000000000 +1100 +++ vlc-0.8.6e/bindings/Makefile.in 2008-02-25 06:07:10.000000000 +1100 @@ -127,6 +127,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -221,6 +222,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/bindings/mediacontrol-python/Makefile.in vlc-0.8.6e/bindings/mediacontrol-python/Makefile.in --- vlc-0.8.6d/bindings/mediacontrol-python/Makefile.in 2007-11-28 06:23:01.000000000 +1100 +++ vlc-0.8.6e/bindings/mediacontrol-python/Makefile.in 2008-02-25 06:07:11.000000000 +1100 @@ -122,6 +122,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -216,6 +217,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/ChangeLog vlc-0.8.6e/ChangeLog --- vlc-0.8.6d/ChangeLog 2007-11-27 00:08:12.000000000 +1100 +++ vlc-0.8.6e/ChangeLog 2008-02-28 05:27:36.000000000 +1100 @@ -1,11 +1,1664 @@ ------------------------------------------------------------------------ -r20579 | jpsaman | 2007-06-16 12:11:51 +0200 (Sat, 16 Jun 2007) | 1 line +r25364 | thresh | 2008-02-26 16:14:14 -0800 (mar, 26 fév 2008) | 2 lines + +Add one more CVE fixed (this time not really ours, but xinelib's). + +------------------------------------------------------------------------ +r25363 | thresh | 2008-02-26 16:07:15 -0800 (mar, 26 fév 2008) | 2 lines + +Backport [24245] and [24246] + +------------------------------------------------------------------------ +r25362 | thresh | 2008-02-26 15:59:58 -0800 (mar, 26 fév 2008) | 2 lines + +Backport [24247]. + +------------------------------------------------------------------------ +r25341 | xtophe | 2008-02-25 14:19:56 -0800 (lun, 25 fév 2008) | 2 lines + +Last update to the changelog and refresh the po + +------------------------------------------------------------------------ +r25282 | Trax | 2008-02-24 11:58:05 -0800 (dim, 24 fév 2008) | 1 line + +NEWS: remove multi-screen improvement for Mac OS X since it isn't included yet +------------------------------------------------------------------------ +r25280 | Trax | 2008-02-24 19:20:27 +0000 (Sun, 24 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +some cosmetics/consistency in NEWS for readability +------------------------------------------------------------------------ +r25261 | thresh | 2008-02-22 17:31:20 +0000 (Fri, 22 Feb 2008) | 7 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/audio_output/alsa.c + +Fix alsa audio output on intel ICH8 with alsa 1.0.14 (maybe even 1.0.14+). +This fixes those annoying messages: +[00000307] main audio output debug: audio output is starving (38397), playing silence +[00000307] alsa audio output debug: recovered from buffer underrun +and sound becomes just fine. +Tested on 32bit and x86_64 systems. + +------------------------------------------------------------------------ +r25258 | thresh | 2008-02-22 11:02:10 +0000 (Fri, 22 Feb 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Backport [25183], fixes build with gcc4.3. + +------------------------------------------------------------------------ +r25257 | fkuehne | 2008-02-21 22:52:50 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +minor fixes +------------------------------------------------------------------------ +r25240 | Trax | 2008-02-21 14:06:01 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* NEWS: using threads 0 is not supported used on Windows (using older x264) +------------------------------------------------------------------------ +r25235 | jb | 2008-02-21 10:52:12 +0000 (Thu, 21 Feb 2008) | 3 lines +Changed paths: + M /branches/0.8.6-bugfix/ChangeLog + A /branches/0.8.6-bugfix/doc/ChangeLog-2008 + +Changelogs. + + +------------------------------------------------------------------------ +r25234 | funman | 2008-02-21 10:28:05 +0000 (Thu, 21 Feb 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + +don't let system tools load freshly compiled out-of-date (wrt the system) libraries + +------------------------------------------------------------------------ +r25233 | Trax | 2008-02-21 10:19:49 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/audio_filter/channel_mixer/simple.c + +* modules/audio_filter/channel_mixer/simple.c: revert mistaken commit of simple.c (aac channel order fix keeps haunting me) +------------------------------------------------------------------------ +r25232 | Trax | 2008-02-21 10:14:45 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/modules/audio_filter/channel_mixer/simple.c + +NEWS: remove FLAC issues, this was fixed in 0.8.6d already +------------------------------------------------------------------------ +r25231 | jb | 2008-02-21 10:07:12 +0000 (Thu, 21 Feb 2008) | 3 lines +Changed paths: + A /branches/0.8.6-bugfix/doc/ChangeLog-2007 + +Add changelog for 2007. + + +------------------------------------------------------------------------ +r25230 | funman | 2008-02-21 10:05:28 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/bootstrap + +-e option isn't available on all echo +------------------------------------------------------------------------ +r25227 | Trax | 2008-02-21 09:16:00 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/mkv.cpp + +* modules/demux/mkv.cpp: backport [19988] apply open probes when checking .mkv in same folder; fix memleak and fix crash when there are multiple .mkv and one of them is corrupt or incomplete +------------------------------------------------------------------------ +r25224 | Trax | 2008-02-21 08:58:15 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/ogg.c + +* modules/demux/ogg.c: backport [25189] compare right amount of data (more strict) in ogg demux +------------------------------------------------------------------------ +r25223 | Trax | 2008-02-21 08:51:03 +0000 (Thu, 21 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/THANKS + M /branches/0.8.6-bugfix/modules/codec/faad.c + +* modules/codec/faad.c: revert [25155] channel order fix since it needs more than also backporting [23226] simple.c so revert for now until we have something that applies to bugfix +------------------------------------------------------------------------ +r25206 | Trax | 2008-02-20 17:56:52 +0000 (Wed, 20 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/mozilla/control/npolibvlc.cpp + +* mozilla/control/npolibvlc.cpp: backport [25203] fixed name argument in add(url, name, options) for mozilla +------------------------------------------------------------------------ +r25167 | Trax | 2008-02-15 22:59:18 +0000 (Fri, 15 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + M /branches/0.8.6-bugfix/extras/contrib/src/Patches/x264-svn-darwin.patch + +* extras/contrib/src/Makefile: update x264 to latest revision (736) and backport darwin patch [24127] to match revision (trunk uses latest too); several memleaks fixed, minor bugfixes, few Altivec improvements, amd64 and FreeBSD support fixes +------------------------------------------------------------------------ +r25160 | Trax | 2008-02-15 17:51:33 +0000 (Fri, 15 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/THANKS + +uhmm. this is the typo in THANKS.. previous commit was cosmetics unneeded dots in NEWS.. +------------------------------------------------------------------------ +r25159 | Trax | 2008-02-15 17:49:54 +0000 (Fri, 15 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +typo in THANKS +------------------------------------------------------------------------ +r25158 | courmisch | 2008-02-15 17:16:03 +0000 (Fri, 15 Feb 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/mp4/mp4.c + +Backport [24941] and [25157] memory error handling + +------------------------------------------------------------------------ +r25156 | Trax | 2008-02-15 16:48:31 +0000 (Fri, 15 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: remove FIXME on plugins, change SA number for MP4 issue; prepare for release based on what we have to keep things upto speed.. +------------------------------------------------------------------------ +r25155 | Trax | 2008-02-15 16:23:22 +0000 (Fri, 15 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/THANKS + M /branches/0.8.6-bugfix/modules/codec/faad.c + +* modules/codec/faad.c: backport [25080] channel order fix for multichannel AAC +------------------------------------------------------------------------ +r25153 | Trax | 2008-02-14 23:21:20 +0000 (Thu, 14 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/modules/codec/x264.c + +* modules/codec/x264.c: backport [25152] fix for x264 threads=0 (auto) +------------------------------------------------------------------------ +r25150 | jb | 2008-02-14 19:19:14 +0000 (Thu, 14 Feb 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/INSTALL.win32 + +Give the correct link to the win32 contribs + +------------------------------------------------------------------------ +r25149 | jb | 2008-02-14 19:04:43 +0000 (Thu, 14 Feb 2008) | 3 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +More NEWS. + + +------------------------------------------------------------------------ +r25148 | jb | 2008-02-14 18:53:58 +0000 (Thu, 14 Feb 2008) | 3 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: Some have been fixed, IIRC. + + +------------------------------------------------------------------------ +r25147 | jb | 2008-02-14 18:51:35 +0000 (Thu, 14 Feb 2008) | 3 lines +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/InfoPlist.strings + M /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj/project.pbxproj + +Branch: 0.8.6e will be the number. + + +------------------------------------------------------------------------ +r25146 | Trax | 2008-02-14 17:35:42 +0000 (Thu, 14 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/x264.c + +* modules/codec/x264.c: backport [25144] cosmetics in reporting version info for x264 +------------------------------------------------------------------------ +r25111 | jpsaman | 2008-02-12 11:42:54 +0000 (Tue, 12 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Backport of [25110] and hack to workaround a bug withe descrpeURL() in older live555 libraries. +------------------------------------------------------------------------ +r25105 | Trax | 2008-02-11 23:10:04 +0000 (Mon, 11 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/x264.c + +* modules/codec/x264.c: backport [25104] add x264 version debug info +------------------------------------------------------------------------ +r25091 | jpsaman | 2008-02-10 22:36:49 +0000 (Sun, 10 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/ffmpeg/video_filter.c + +Backport of [25090]: Cleanup in the error path +------------------------------------------------------------------------ +r25088 | jpsaman | 2008-02-10 22:12:30 +0000 (Sun, 10 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/ffmpeg/video_filter.c + +Fix memleak ffmpeg/video_filter.c +------------------------------------------------------------------------ +r25075 | Trax | 2008-02-10 15:12:17 +0000 (Sun, 10 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +* modules/demux/live555.cpp: uint -> uint32_t compile fix +------------------------------------------------------------------------ +r25069 | courmisch | 2008-02-10 12:14:17 +0000 (Sun, 10 Feb 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/video_output/x11/xcommon.c + M /branches/0.8.6-bugfix/modules/video_output/x11/xcommon.h + +Backport [22107] and [25067] MIT-SHM fixes. + +------------------------------------------------------------------------ +r25029 | jpsaman | 2008-02-09 14:38:13 +0000 (Sat, 09 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Fix handling of authorization +------------------------------------------------------------------------ +r25011 | Trax | 2008-02-08 23:43:15 +0000 (Fri, 08 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + +configure.ac: backport [24902] use build_os instead of SYS for detecting cygwin for hostname check because when we deal with mingw32 compiler (mno-cygwin mode) then SYS value isn't cygwin but (forced to) mingw32 +------------------------------------------------------------------------ +r25010 | Trax | 2008-02-08 23:32:20 +0000 (Fri, 08 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/x264.c + +* modules/codec/x264.c: backport [25007] fix direct 8x8 inference warnings +------------------------------------------------------------------------ +r24999 | jpsaman | 2008-02-08 20:44:09 +0000 (Fri, 08 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Backport of [24998] +------------------------------------------------------------------------ +r24997 | jpsaman | 2008-02-08 20:35:34 +0000 (Fri, 08 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Backport [23166] [23170] [23182] [23183] [23483] [23526] [23527] [23596]: Several live555 demuxer fixes. +------------------------------------------------------------------------ +r24945 | courmisch | 2008-02-07 18:53:40 +0000 (Thu, 07 Feb 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/mp4/mp4.c + +Backport [24944] (CORE-2008-0130) + +------------------------------------------------------------------------ +r24880 | jb | 2008-02-05 04:14:56 +0000 (Tue, 05 Feb 2008) | 3 lines +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + M /branches/0.8.6-bugfix/extras/contrib/src/Patches/xml2-win32.patch + M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak + +Contribs for branch: XML CVE-2007-6284 backport with adaptations... + + +------------------------------------------------------------------------ +r24744 | fkuehne | 2008-02-01 11:01:00 +0000 (Fri, 01 Feb 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + A /branches/0.8.6-bugfix/extras/contrib/src/Patches/SDL_image-CVE-2006-4484.patch + +SDL_image: backported a fixed version of thresh's patch [24741] +------------------------------------------------------------------------ +r24693 | Trax | 2008-01-29 18:58:49 +0000 (Tue, 29 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + +* configure.ac: backport [24621] fix hostname reporting on Cygwin +------------------------------------------------------------------------ +r24565 | funman | 2008-01-25 12:32:17 +0000 (Fri, 25 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/po/pl.po + +polish translation update + +------------------------------------------------------------------------ +r24518 | Trax | 2008-01-23 13:23:12 +0000 (Wed, 23 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: add fix for SPS/PPS in h264 packetizer +------------------------------------------------------------------------ +r24466 | jb | 2008-01-21 20:38:31 +0000 (Mon, 21 Jan 2008) | 3 lines +Changed paths: + M /branches/0.8.6-bugfix/vlc.win32.nsi.in + +Backport [24465], for romanian installer... + + +------------------------------------------------------------------------ +r24447 | Trax | 2008-01-20 23:14:16 +0000 (Sun, 20 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/ogg.c + +* modules/demux/ogg.c: backport [24258] fix for demuxing Ogg with skeleton track. As noted in #1412 all content in Ogg now require a skeleton track.. +------------------------------------------------------------------------ +r24446 | Trax | 2008-01-20 21:54:09 +0000 (Sun, 20 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/THANKS + M /branches/0.8.6-bugfix/modules/audio_output/alsa.c + +* modules/audio_output/alsa.c: backport [24390] fix for 5.1 audio on ALSA (broken pipe) +------------------------------------------------------------------------ +r24443 | xtophe | 2008-01-20 19:45:00 +0000 (Sun, 20 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/access/rtsp/real_sdpplin.c + +Backport [24440]. Avoid buffer overflow. Fix #1442. Refs CVE-2008-0295 CVE-2008-0296 + +------------------------------------------------------------------------ +r24427 | courmisch | 2008-01-19 20:49:31 +0000 (Sat, 19 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +Sort out all CVE numbers I could find + +------------------------------------------------------------------------ +r24426 | courmisch | 2008-01-19 20:39:08 +0000 (Sat, 19 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +CVE references (backport) + +------------------------------------------------------------------------ +r24413 | xtophe | 2008-01-19 14:03:15 +0000 (Sat, 19 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/po/pl.po + +Polish translation update by Micha?\197?\130 Trzebiatowski + +------------------------------------------------------------------------ +r24387 | Trax | 2008-01-18 13:26:53 +0000 (Fri, 18 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/ts.c + +* modules/demux/ts.c: backport [24386] removal of excessive ; +------------------------------------------------------------------------ +r24384 | jpsaman | 2008-01-18 10:13:07 +0000 (Fri, 18 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/packetizer/h264.c + +Backport [24383]: fix regression introduced in [24382] +------------------------------------------------------------------------ +r24382 | jpsaman | 2008-01-18 08:02:19 +0000 (Fri, 18 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/packetizer/h264.c + +Backport of [24381] +------------------------------------------------------------------------ +r24380 | jpsaman | 2008-01-18 07:48:17 +0000 (Fri, 18 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/include/vlc_common.h + +Oops forgot that in previous commit +------------------------------------------------------------------------ +r24355 | jpsaman | 2008-01-17 11:32:13 +0000 (Thu, 17 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/ts.c + +Backport various fixes from trunk/modules/demux/ts.c this fixes playback of some mp4/h264 files. +------------------------------------------------------------------------ +r24354 | jpsaman | 2008-01-17 10:12:08 +0000 (Thu, 17 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/packetizer/h264.c + +Backport h264.c part of [20345] and sync with [24090], [24240], [24241]. +------------------------------------------------------------------------ +r24300 | Trax | 2008-01-14 20:17:23 +0000 (Mon, 14 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/modules/gui/wxwidgets/interface.cpp + +* configure.ac, modules/gui/wxwidgets/interface.cpp: backport (where it applied to wx) [23985] COPYRIGHT_YEARS, [24271] hostname -s and [24272] HAVE_LIBPNG +------------------------------------------------------------------------ +r24243 | Trax | 2008-01-11 20:34:57 +0000 (Fri, 11 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/mux/mp4.c + +* modules/mux/mp4.c: backport [24242] typo opend -> opened +------------------------------------------------------------------------ +r24238 | fkuehne | 2008-01-11 16:45:19 +0000 (Fri, 11 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access/cdda.c + +cdda: recognise vlc_input_item_AddInfo()'s order, so we show our artist correctly in CDDB mode +------------------------------------------------------------------------ +r24211 | Trax | 2008-01-09 23:08:29 +0000 (Wed, 09 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: add H.264 fix for playback on iPhones +------------------------------------------------------------------------ +r24208 | jpsaman | 2008-01-09 19:50:03 +0000 (Wed, 09 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/THANKS + M /branches/0.8.6-bugfix/modules/mux/mp4.c + +Patch by Christopher Key. Attached is a patch that fixes a long standing problem whereby video encoded with vlc using x264 cannot be made playable on an iPhone. The issue was traced to the H264 profile value being incorrectly set, which this patch addresses. Looking at the code, the trunk appears to have had a complete rewrite and should be unaffected, but this may be useful for a 0.8.6e release. + +------------------------------------------------------------------------ +r24206 | fkuehne | 2008-01-09 11:52:43 +0000 (Wed, 09 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: added a note about the video-device reset on first launch +------------------------------------------------------------------------ +r24203 | fkuehne | 2008-01-08 16:11:38 +0000 (Tue, 08 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak + +contrib: use ganesh as mirror for gnupg.org stuff for this branch, too +------------------------------------------------------------------------ +r24202 | fkuehne | 2008-01-08 16:02:50 +0000 (Tue, 08 Jan 2008) | 1 line +Changed paths: + D /branches/0.8.6-bugfix/extras/contrib/src/Patches/live-config.patch + D /branches/0.8.6-bugfix/extras/contrib/src/Patches/live-osx.patch + D /branches/0.8.6-bugfix/extras/contrib/src/Patches/live.patch + D /branches/0.8.6-bugfix/extras/contrib/src/Patches/livedotcom-win32.patch + +contrib: delete old live patches +------------------------------------------------------------------------ +r24201 | fkuehne | 2008-01-08 16:01:18 +0000 (Tue, 08 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + +contrib: used latest live555 +------------------------------------------------------------------------ +r24197 | fkuehne | 2008-01-08 15:03:04 +0000 (Tue, 08 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/bootstrap + +contrib: use the 10.3.9 SDK for compilation on PowerPC-based Macs +------------------------------------------------------------------------ +r24196 | fkuehne | 2008-01-08 13:40:36 +0000 (Tue, 08 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.m + +gui/macosx: adapted fspanel and embeddedwindow to the changes in [24189] (also refs #1427) +------------------------------------------------------------------------ +r24195 | fkuehne | 2008-01-08 13:22:38 +0000 (Tue, 08 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/fspanel.m + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + +gui/macosx: fixed a few logic errors introduced in [24189] (refs #1427) +------------------------------------------------------------------------ +r24189 | pdherbemont | 2008-01-07 23:51:57 +0000 (Mon, 07 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/fspanel.h + M /branches/0.8.6-bugfix/modules/gui/macosx/fspanel.m + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + +gui/macosx: Make sure we treat screens as screen, instead of screen number. + +------------------------------------------------------------------------ +r24166 | fkuehne | 2008-01-07 14:55:36 +0000 (Mon, 07 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + M /branches/0.8.6-bugfix/modules/gui/macosx/macosx.m + +macosx: hide the 'embedded vout' setting, since we don't want it to be used. NEWS +------------------------------------------------------------------------ +r24165 | fkuehne | 2008-01-07 14:48:17 +0000 (Mon, 07 Jan 2008) | 6 lines +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + M /branches/0.8.6-bugfix/modules/video_output/opengl.c + +* restore full compatibility for Mac OS X 10.3.9 + - limited to Quartz video output (OpenGL refuses to work in fullscreen mode) + - controlled by opengl.c, which is linked to Carbon for this purpose + - removed blocker from intf.m + - introduced memory management to VLCEmbeddedList (!!!) + - sanity checks for vout.m +------------------------------------------------------------------------ +r24146 | Trax | 2008-01-06 17:11:53 +0000 (Sun, 06 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: add fix for FTP pausing +------------------------------------------------------------------------ +r24145 | Trax | 2008-01-06 17:10:37 +0000 (Sun, 06 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access/ftp.c + +* modules/access/ftp.c: backport [24140] fix for FTP pausing +------------------------------------------------------------------------ +r24033 | jpsaman | 2008-01-02 13:03:06 +0000 (Wed, 02 Jan 2008) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Backport [24032]: Fix signed int, unsigned int comparison +------------------------------------------------------------------------ +r23998 | pdherbemont | 2008-01-01 20:37:16 +0000 (Tue, 01 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +Dts to S/PDIF in the News. + +------------------------------------------------------------------------ +r23997 | pdherbemont | 2008-01-01 20:36:56 +0000 (Tue, 01 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/THANKS + +Backport Julien Robert. + +------------------------------------------------------------------------ +r23994 | pdherbemont | 2008-01-01 19:07:13 +0000 (Tue, 01 Jan 2008) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/audio_filter/converter/dtstospdif.c + +Backport Julien Robert's dts fixes [23948] and [23941]. + +------------------------------------------------------------------------ +r23964 | fkuehne | 2007-12-31 12:09:38 +0000 (Mon, 31 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + +macosx: prevent VLC from crashing on quit while playing by adding additional checks +------------------------------------------------------------------------ +r23963 | fkuehne | 2007-12-31 10:05:05 +0000 (Mon, 31 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj/project.pbxproj + +vlc-proj: backport [23962] (closes #1279) +------------------------------------------------------------------------ +r23961 | funman | 2007-12-31 04:04:05 +0000 (Mon, 31 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/vlc.win32.nsi.in + +backport [20671] +------------------------------------------------------------------------ +r23953 | funman | 2007-12-30 20:55:54 +0000 (Sun, 30 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/ncurses.c + +backport [23952] +------------------------------------------------------------------------ +r23945 | funman | 2007-12-30 15:39:40 +0000 (Sun, 30 Dec 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + +builds wxwidgets with unicode support + +------------------------------------------------------------------------ +r23944 | funman | 2007-12-30 15:33:27 +0000 (Sun, 30 Dec 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/po/af.po + M /branches/0.8.6-bugfix/po/ar.po + M /branches/0.8.6-bugfix/po/ca.po + M /branches/0.8.6-bugfix/po/co.po + M /branches/0.8.6-bugfix/po/cs.po + M /branches/0.8.6-bugfix/po/da.po + M /branches/0.8.6-bugfix/po/de.po + M /branches/0.8.6-bugfix/po/en_GB.po + M /branches/0.8.6-bugfix/po/es.po + M /branches/0.8.6-bugfix/po/eu.po + M /branches/0.8.6-bugfix/po/fa.po + M /branches/0.8.6-bugfix/po/fr.po + M /branches/0.8.6-bugfix/po/fur.po + M /branches/0.8.6-bugfix/po/gl.po + M /branches/0.8.6-bugfix/po/he.po + M /branches/0.8.6-bugfix/po/hi.po + M /branches/0.8.6-bugfix/po/hu.po + M /branches/0.8.6-bugfix/po/it.po + M /branches/0.8.6-bugfix/po/ja.po + M /branches/0.8.6-bugfix/po/ka.po + M /branches/0.8.6-bugfix/po/ko.po + M /branches/0.8.6-bugfix/po/lt.po + M /branches/0.8.6-bugfix/po/lv.po + M /branches/0.8.6-bugfix/po/ms.po + M /branches/0.8.6-bugfix/po/nb.po + M /branches/0.8.6-bugfix/po/ne.po + M /branches/0.8.6-bugfix/po/nl.po + M /branches/0.8.6-bugfix/po/nn.po + M /branches/0.8.6-bugfix/po/oc.po + M /branches/0.8.6-bugfix/po/pa.po + M /branches/0.8.6-bugfix/po/pl.po + M /branches/0.8.6-bugfix/po/pt_BR.po + M /branches/0.8.6-bugfix/po/ro.po + M /branches/0.8.6-bugfix/po/ru.po + M /branches/0.8.6-bugfix/po/sk.po + M /branches/0.8.6-bugfix/po/sl.po + M /branches/0.8.6-bugfix/po/sq.po + M /branches/0.8.6-bugfix/po/sv.po + M /branches/0.8.6-bugfix/po/th.po + M /branches/0.8.6-bugfix/po/tr.po + M /branches/0.8.6-bugfix/po/vlc.pot + M /branches/0.8.6-bugfix/po/zh_CN.po + M /branches/0.8.6-bugfix/po/zh_TW.po + +update Romanian and Polish translations, make update-po + +------------------------------------------------------------------------ +r23943 | fkuehne | 2007-12-30 14:59:04 +0000 (Sun, 30 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.h + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + M /branches/0.8.6-bugfix/modules/gui/macosx/prefs.m + +macosx: backport [23942] as it is save +------------------------------------------------------------------------ +r23927 | jpsaman | 2007-12-29 12:17:38 +0000 (Sat, 29 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/ffmpeg/mux.c + +Backport [23204] and [23274] for building 0.8.6-bugfix branch with newer ffmpeg. +------------------------------------------------------------------------ +r23888 | fkuehne | 2007-12-27 12:44:35 +0000 (Thu, 27 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* prepare NEWS for 0.8.6e (DRAFT) +------------------------------------------------------------------------ +r23884 | fkuehne | 2007-12-26 20:09:53 +0000 (Wed, 26 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.m + +* fix 'fullscreen only opens where my vout is, but I told it to open on another screen'. Remember that CGScreenID is different from VLC's 'video-device' +------------------------------------------------------------------------ +r23864 | Trax | 2007-12-25 20:49:49 +0000 (Tue, 25 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access/dc1394.c + M /branches/0.8.6-bugfix/modules/access/v4l/v4l.c + +* modules/access/v4l.c and dc1394.c: backport [23688] typo openened -> opened +------------------------------------------------------------------------ +r23859 | Trax | 2007-12-24 19:06:04 +0000 (Mon, 24 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/mp4/libmp4.c + +* modules/demux/mp4/libmp4.c: backport part of [23751] for proper spelling of the word incompletely +------------------------------------------------------------------------ +r23855 | courmisch | 2007-12-24 16:42:08 +0000 (Mon, 24 Dec 2007) | 5 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/subtitle.c + +[20715] is too large to be backported. Put buffer size limits instead. + +When you commit security fixes, please don't bundle them with feature extensions, and +please *do* backport them yourself. + +------------------------------------------------------------------------ +r23854 | courmisch | 2007-12-24 16:35:53 +0000 (Mon, 24 Dec 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/src/network/httpd.c + +Backport [23839] HTTP Connection format string + +------------------------------------------------------------------------ +r23588 | xtophe | 2007-12-12 23:18:07 +0000 (Wed, 12 Dec 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/po/ro.po + +Romanian translation update by Cristian Secar?\196?\131 + +------------------------------------------------------------------------ +r23505 | Trax | 2007-12-09 00:59:20 +0000 (Sun, 09 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/playlist/m3u.c + +backport [23504] typo in m3u.c +------------------------------------------------------------------------ +r23470 | Trax | 2007-12-06 00:59:36 +0000 (Thu, 06 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/dmo/dmo.c + +also in dmo.c typo ouput -> output +------------------------------------------------------------------------ +r23469 | Trax | 2007-12-06 00:58:02 +0000 (Thu, 06 Dec 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access/dshow/crossbar.cpp + +typo ouput -> output +------------------------------------------------------------------------ +r23388 | fkuehne | 2007-11-27 22:14:22 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + +* cough, cough +------------------------------------------------------------------------ +r23382 | fkuehne | 2007-11-27 19:27:20 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/po/Makefile.in.in + M /branches/0.8.6-bugfix/po/POTFILES.in + M /branches/0.8.6-bugfix/po/af.po + M /branches/0.8.6-bugfix/po/ar.po + M /branches/0.8.6-bugfix/po/ca.po + M /branches/0.8.6-bugfix/po/co.po + M /branches/0.8.6-bugfix/po/cs.po + M /branches/0.8.6-bugfix/po/da.po + M /branches/0.8.6-bugfix/po/de.po + M /branches/0.8.6-bugfix/po/en_GB.po + M /branches/0.8.6-bugfix/po/es.po + M /branches/0.8.6-bugfix/po/eu.po + M /branches/0.8.6-bugfix/po/fa.po + M /branches/0.8.6-bugfix/po/fr.po + M /branches/0.8.6-bugfix/po/fur.po + M /branches/0.8.6-bugfix/po/gl.po + M /branches/0.8.6-bugfix/po/he.po + M /branches/0.8.6-bugfix/po/hi.po + M /branches/0.8.6-bugfix/po/hu.po + M /branches/0.8.6-bugfix/po/it.po + M /branches/0.8.6-bugfix/po/ja.po + M /branches/0.8.6-bugfix/po/ka.po + M /branches/0.8.6-bugfix/po/ko.po + M /branches/0.8.6-bugfix/po/lt.po + M /branches/0.8.6-bugfix/po/lv.po + M /branches/0.8.6-bugfix/po/ms.po + M /branches/0.8.6-bugfix/po/nb.po + M /branches/0.8.6-bugfix/po/ne.po + M /branches/0.8.6-bugfix/po/nl.po + M /branches/0.8.6-bugfix/po/nn.po + M /branches/0.8.6-bugfix/po/oc.po + M /branches/0.8.6-bugfix/po/pa.po + M /branches/0.8.6-bugfix/po/pl.po + M /branches/0.8.6-bugfix/po/pt_BR.po + M /branches/0.8.6-bugfix/po/ro.po + M /branches/0.8.6-bugfix/po/ru.po + M /branches/0.8.6-bugfix/po/sk.po + M /branches/0.8.6-bugfix/po/sl.po + M /branches/0.8.6-bugfix/po/sq.po + M /branches/0.8.6-bugfix/po/sv.po + M /branches/0.8.6-bugfix/po/th.po + M /branches/0.8.6-bugfix/po/tr.po + M /branches/0.8.6-bugfix/po/vlc.pot + M /branches/0.8.6-bugfix/po/zh_CN.po + M /branches/0.8.6-bugfix/po/zh_TW.po + +* updated the po files again as we removed files +------------------------------------------------------------------------ +r23381 | fkuehne | 2007-11-27 19:26:51 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.h + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + +* be clean and nice +------------------------------------------------------------------------ +r23380 | fkuehne | 2007-11-27 19:17:20 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/Makefile.am + M /branches/0.8.6-bugfix/NEWS + D /branches/0.8.6-bugfix/modules/gui/macosx/update.h + D /branches/0.8.6-bugfix/modules/gui/macosx/update.m + +* announce the update facility removal and fix make dist (broken in previous commit) +------------------------------------------------------------------------ +r23379 | fkuehne | 2007-11-27 19:10:16 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib + D /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Update.nib + M /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj/project.pbxproj + M /branches/0.8.6-bugfix/modules/gui/macosx/Modules.am + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.h + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + M /branches/0.8.6-bugfix/modules/gui/wxwidgets/interface.cpp + +* removed the check-for-update dialogues for 0.8.6d +------------------------------------------------------------------------ +r23376 | fkuehne | 2007-11-27 17:00:43 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + D /branches/0.8.6-bugfix/m4/glibc2.m4 + A /branches/0.8.6-bugfix/m4/glibc21.m4 + +* typo in previous commit +------------------------------------------------------------------------ +r23375 | fkuehne | 2007-11-27 16:50:14 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/m4/Makefile.am + M /branches/0.8.6-bugfix/m4/codeset.m4 + M /branches/0.8.6-bugfix/m4/gettext.m4 + D /branches/0.8.6-bugfix/m4/glibc21.m4 + M /branches/0.8.6-bugfix/m4/iconv.m4 + M /branches/0.8.6-bugfix/m4/intdiv0.m4 + D /branches/0.8.6-bugfix/m4/intl.m4 + D /branches/0.8.6-bugfix/m4/intldir.m4 + D /branches/0.8.6-bugfix/m4/intmax.m4 + M /branches/0.8.6-bugfix/m4/inttypes-pri.m4 + A /branches/0.8.6-bugfix/m4/inttypes.m4 + M /branches/0.8.6-bugfix/m4/inttypes_h.m4 + A /branches/0.8.6-bugfix/m4/isc-posix.m4 + M /branches/0.8.6-bugfix/m4/lcmessage.m4 + M /branches/0.8.6-bugfix/m4/lib-ld.m4 + M /branches/0.8.6-bugfix/m4/lib-link.m4 + M /branches/0.8.6-bugfix/m4/lib-prefix.m4 + D /branches/0.8.6-bugfix/m4/lock.m4 + D /branches/0.8.6-bugfix/m4/longdouble.m4 + D /branches/0.8.6-bugfix/m4/longlong.m4 + D /branches/0.8.6-bugfix/m4/nls.m4 + D /branches/0.8.6-bugfix/m4/po.m4 + D /branches/0.8.6-bugfix/m4/printf-posix.m4 + D /branches/0.8.6-bugfix/m4/private.m4 + M /branches/0.8.6-bugfix/m4/progtest.m4 + D /branches/0.8.6-bugfix/m4/size_max.m4 + M /branches/0.8.6-bugfix/m4/stdint_h.m4 + M /branches/0.8.6-bugfix/m4/uintmax_t.m4 + M /branches/0.8.6-bugfix/m4/ulonglong.m4 + D /branches/0.8.6-bugfix/m4/visibility.m4 + D /branches/0.8.6-bugfix/m4/wchar_t.m4 + D /branches/0.8.6-bugfix/m4/wint_t.m4 + D /branches/0.8.6-bugfix/m4/xsize.m4 + +* reverting [23201], part 2, as current m4 files obviously are not compatible with older gettext releases (should have been part of [23368] +------------------------------------------------------------------------ +r23373 | fkuehne | 2007-11-27 13:09:10 +0000 (Tue, 27 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/InfoPlist.strings + M /branches/0.8.6-bugfix/extras/MacOSX/plugin/English.lproj/InfoPlist.strings + M /branches/0.8.6-bugfix/extras/MacOSX/plugin/Info.plist + M /branches/0.8.6-bugfix/extras/MacOSX/plugin/InstallerInfo.plist + M /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj/project.pbxproj + +* prepare for release +------------------------------------------------------------------------ +r23369 | damienf | 2007-11-27 00:11:18 +0000 (Tue, 27 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/mozilla/vlcplugin.cpp + +mozilla: backport absolute URL parsing from trunk + +------------------------------------------------------------------------ +r23368 | fkuehne | 2007-11-26 23:30:15 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/bootstrap + M /branches/0.8.6-bugfix/configure.ac + +* reverted [22301] as it breaks more than it solves +------------------------------------------------------------------------ +r23362 | Trax | 2007-11-26 19:34:14 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/dmo/dmo.c + +* modules/codec/dmo/dmo.c: backport [16784] add MSS2, MSS1, WMVA, WVP2 and WMVP (still using the old dll name scheme). +------------------------------------------------------------------------ +r23360 | Trax | 2007-11-26 18:57:51 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/codec/dmo/dmo.c + +* modules/codec/dmo/dmo.c: backport (part of) [23314] missing fourcc capitalization +------------------------------------------------------------------------ +r23357 | Trax | 2007-11-26 18:47:33 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: remove autoreconnect for shout +------------------------------------------------------------------------ +r23356 | Trax | 2007-11-26 18:44:59 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access_output/shout.c + +* modules/access_output/shout.c: Revert [23295], [23317] and [23318] - Autoreconnect mechanism (not all issues are covered yet for bugfix). Reopened #1167 for now +------------------------------------------------------------------------ +r23346 | fkuehne | 2007-11-26 13:26:15 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* update NEWS for test1 +------------------------------------------------------------------------ +r23345 | fkuehne | 2007-11-26 13:24:07 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/playlist/playlist.c + +* fix [23303] +------------------------------------------------------------------------ +r23344 | fkuehne | 2007-11-26 13:15:24 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/Makefile.am + +* fixed make dist +------------------------------------------------------------------------ +r23343 | fkuehne | 2007-11-26 13:03:01 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/po/POTFILES.in + M /branches/0.8.6-bugfix/po/af.po + M /branches/0.8.6-bugfix/po/ar.po + M /branches/0.8.6-bugfix/po/ca.po + M /branches/0.8.6-bugfix/po/co.po + M /branches/0.8.6-bugfix/po/cs.po + M /branches/0.8.6-bugfix/po/da.po + M /branches/0.8.6-bugfix/po/de.po + M /branches/0.8.6-bugfix/po/en_GB.po + M /branches/0.8.6-bugfix/po/es.po + M /branches/0.8.6-bugfix/po/eu.po + M /branches/0.8.6-bugfix/po/fa.po + M /branches/0.8.6-bugfix/po/fr.po + M /branches/0.8.6-bugfix/po/fur.po + M /branches/0.8.6-bugfix/po/gl.po + M /branches/0.8.6-bugfix/po/he.po + M /branches/0.8.6-bugfix/po/hi.po + M /branches/0.8.6-bugfix/po/hu.po + M /branches/0.8.6-bugfix/po/it.po + M /branches/0.8.6-bugfix/po/ja.po + M /branches/0.8.6-bugfix/po/ka.po + M /branches/0.8.6-bugfix/po/ko.po + M /branches/0.8.6-bugfix/po/lt.po + M /branches/0.8.6-bugfix/po/lv.po + M /branches/0.8.6-bugfix/po/ms.po + M /branches/0.8.6-bugfix/po/nb.po + M /branches/0.8.6-bugfix/po/ne.po + M /branches/0.8.6-bugfix/po/nl.po + M /branches/0.8.6-bugfix/po/nn.po + M /branches/0.8.6-bugfix/po/oc.po + M /branches/0.8.6-bugfix/po/pa.po + M /branches/0.8.6-bugfix/po/pl.po + M /branches/0.8.6-bugfix/po/pt_BR.po + M /branches/0.8.6-bugfix/po/ro.po + M /branches/0.8.6-bugfix/po/ru.po + M /branches/0.8.6-bugfix/po/sk.po + M /branches/0.8.6-bugfix/po/sl.po + M /branches/0.8.6-bugfix/po/sq.po + M /branches/0.8.6-bugfix/po/sv.po + M /branches/0.8.6-bugfix/po/th.po + M /branches/0.8.6-bugfix/po/tr.po + M /branches/0.8.6-bugfix/po/vlc.pot + M /branches/0.8.6-bugfix/po/zh_CN.po + M /branches/0.8.6-bugfix/po/zh_TW.po + +* updated the po-files for test1 +------------------------------------------------------------------------ +r23342 | fkuehne | 2007-11-26 13:00:38 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj/project.pbxproj + +* forgot these 2 +------------------------------------------------------------------------ +r23341 | fkuehne | 2007-11-26 12:55:45 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Patches/x264-svn-darwin.patch + +* small addition to the existing x264 trunk patch to work-around a GCC 4.0.1 darwin-ppc limitation +------------------------------------------------------------------------ +r23340 | fkuehne | 2007-11-26 12:30:22 +0000 (Mon, 26 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/InfoPlist.strings + M /branches/0.8.6-bugfix/extras/MacOSX/plugin/English.lproj/InfoPlist.strings + M /branches/0.8.6-bugfix/extras/MacOSX/plugin/Info.plist + M /branches/0.8.6-bugfix/extras/MacOSX/plugin/InstallerInfo.plist + +* updated the version strings for test1 +------------------------------------------------------------------------ +r23332 | fkuehne | 2007-11-25 22:01:25 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* same as previous commit +------------------------------------------------------------------------ +r23331 | fkuehne | 2007-11-25 21:58:48 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* spelling improvements +------------------------------------------------------------------------ +r23330 | Trax | 2007-11-25 21:33:18 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: no need to capitalize Mac :) +------------------------------------------------------------------------ +r23329 | Trax | 2007-11-25 21:20:39 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access_output/shout.c + +* modules/access_output/shout.c: backport [23318] auto reconnect on startup. +------------------------------------------------------------------------ +r23328 | fkuehne | 2007-11-25 20:54:07 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/bootstrap + +* we discontinued 10.3 by this release +------------------------------------------------------------------------ +r23327 | fkuehne | 2007-11-25 16:54:29 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + +clean up before committing... sorry for the disturbance +------------------------------------------------------------------------ +r23326 | fkuehne | 2007-11-25 16:40:36 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + +this wasn't intended to be committed... +------------------------------------------------------------------------ +r23325 | fkuehne | 2007-11-25 16:37:49 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + +* disable 10.3 usage, as we can't provide a reliable version due to missing testing possibilities and linking issues against the 10.3.9 SDK +------------------------------------------------------------------------ +r23323 | Trax | 2007-11-25 15:59:43 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: improved H.264 encoding speed on Mac +------------------------------------------------------------------------ +r23322 | fkuehne | 2007-11-25 15:49:20 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + A /branches/0.8.6-bugfix/extras/contrib/src/Patches/x264-svn-darwin.patch + +* upgraded x264 to the latest revision (701) with a minor patch for Darwin to include recent speed improvements +------------------------------------------------------------------------ +r23319 | Trax | 2007-11-25 12:50:19 +0000 (Sun, 25 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access_output/shout.c + +* modules/access_output/shout.c: backport [23317] sync before you shout. +------------------------------------------------------------------------ +r23305 | Trax | 2007-11-24 19:30:50 +0000 (Sat, 24 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: auto reconnect for shout module +------------------------------------------------------------------------ +r23304 | Trax | 2007-11-24 19:27:24 +0000 (Sat, 24 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access_output/shout.c + +backport [23295] fix for proper automatic reconnect in shout module +------------------------------------------------------------------------ +r23303 | dionoea | 2007-11-24 19:15:12 +0000 (Sat, 24 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/modules/demux/playlist/m3u.c + M /branches/0.8.6-bugfix/modules/demux/playlist/playlist.c + +EXTVLCOPT parsing: Revert r23198 and backport r23299. + +------------------------------------------------------------------------ +r23289 | jb | 2007-11-24 01:03:49 +0000 (Sat, 24 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +FLAC CVE mention + +------------------------------------------------------------------------ +r23271 | funman | 2007-11-23 13:17:32 +0000 (Fri, 23 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/m4/Makefile.am + +fix make dist. reported by kwizart +------------------------------------------------------------------------ +r23245 | jpsaman | 2007-11-22 18:16:01 +0000 (Thu, 22 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/bootstrap + +Always test in decending order of version numbers. Fixes detection of older versions even when newer are available. +------------------------------------------------------------------------ +r23241 | fkuehne | 2007-11-22 09:06:32 +0000 (Thu, 22 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + +* don't use NSLog here +------------------------------------------------------------------------ +r23240 | fkuehne | 2007-11-22 08:55:54 +0000 (Thu, 22 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/bootstrap + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + M /branches/0.8.6-bugfix/extras/contrib/src/Patches/flac-mactel.patch + +* updated patch for FLAC 1.2.1 and disabled all ASM optimisations for OSX Intel, as they aren't supported. I object this update and would like to continue using the 1.1.x series of FLAC for this branch. +------------------------------------------------------------------------ +r23238 | xtophe | 2007-11-21 23:43:22 +0000 (Wed, 21 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/access/smb.c + +Prevent problem with new glibc. backport [21941] +------------------------------------------------------------------------ +r23237 | xtophe | 2007-11-21 22:42:00 +0000 (Wed, 21 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/share/applications/vlc.desktop + +Backport [23236] +------------------------------------------------------------------------ +r23234 | xtophe | 2007-11-21 22:29:18 +0000 (Wed, 21 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/share/applications/vlc.desktop + +Backport [20874], [21248], [22667] + +------------------------------------------------------------------------ +r23230 | funman | 2007-11-21 22:17:44 +0000 (Wed, 21 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/src/misc/charset.c + +Prefer ISO-8859-8 over CP1255 for subtitles encoding on Windows systems with Hebrew language +------------------------------------------------------------------------ +r23229 | jpsaman | 2007-11-21 22:11:12 +0000 (Wed, 21 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Patch by Glen Gray: Enable keepalive for Kasenna servers, they parse the User Agent string and check for _KA appended to the User Agent name. + +------------------------------------------------------------------------ +r23228 | jpsaman | 2007-11-21 22:00:20 +0000 (Wed, 21 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/THANKS + M /branches/0.8.6-bugfix/modules/demux/live555.cpp + +Patch by Glen Gray: RTSP keep alive fix. If the server doesn't handle RTCP-RR packets and requires specific GET_PARAMETER commands (such as Kasenna) then the session times out when vlc is paused because the current version only sends the info when Demux() is called. Demux() is only called when data is received. This patch fixes this issue with a boolean that is set during PAUSED state that allows the timer thread to send the GET_PARAMTER messages instead and thus keeping the RTSP session alive. + +------------------------------------------------------------------------ +r23212 | fkuehne | 2007-11-20 23:46:37 +0000 (Tue, 20 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + +* re-enabled the update panel +------------------------------------------------------------------------ +r23210 | Trax | 2007-11-20 23:02:30 +0000 (Tue, 20 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* NEWS: slightly improved description on stream discontinuity fix +------------------------------------------------------------------------ +r23202 | courmisch | 2007-11-20 19:40:20 +0000 (Tue, 20 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/src/misc/update.c + +Backport [22022], [22051] + +------------------------------------------------------------------------ +r23201 | courmisch | 2007-11-20 19:34:19 +0000 (Tue, 20 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix + M /branches/0.8.6-bugfix/bootstrap + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/m4/ac_prog_java.m4 + M /branches/0.8.6-bugfix/m4/ac_prog_java_cc.m4 + M /branches/0.8.6-bugfix/m4/ac_prog_java_works.m4 + M /branches/0.8.6-bugfix/m4/ac_prog_javac.m4 + M /branches/0.8.6-bugfix/m4/ac_prog_javac_works.m4 + M /branches/0.8.6-bugfix/m4/ac_prog_javah.m4 + M /branches/0.8.6-bugfix/m4/codeset.m4 + M /branches/0.8.6-bugfix/m4/gettext.m4 + A /branches/0.8.6-bugfix/m4/glibc2.m4 + M /branches/0.8.6-bugfix/m4/glibc21.m4 + M /branches/0.8.6-bugfix/m4/iconv.m4 + M /branches/0.8.6-bugfix/m4/intdiv0.m4 + A /branches/0.8.6-bugfix/m4/intl.m4 + A /branches/0.8.6-bugfix/m4/intldir.m4 + A /branches/0.8.6-bugfix/m4/intmax.m4 + M /branches/0.8.6-bugfix/m4/inttypes-pri.m4 + D /branches/0.8.6-bugfix/m4/inttypes.m4 + M /branches/0.8.6-bugfix/m4/inttypes_h.m4 + D /branches/0.8.6-bugfix/m4/isc-posix.m4 + M /branches/0.8.6-bugfix/m4/lcmessage.m4 + M /branches/0.8.6-bugfix/m4/lib-ld.m4 + M /branches/0.8.6-bugfix/m4/lib-link.m4 + M /branches/0.8.6-bugfix/m4/lib-prefix.m4 + A /branches/0.8.6-bugfix/m4/lock.m4 + A /branches/0.8.6-bugfix/m4/longdouble.m4 + A /branches/0.8.6-bugfix/m4/longlong.m4 + A /branches/0.8.6-bugfix/m4/nls.m4 + A /branches/0.8.6-bugfix/m4/po.m4 + A /branches/0.8.6-bugfix/m4/printf-posix.m4 + A /branches/0.8.6-bugfix/m4/private.m4 + M /branches/0.8.6-bugfix/m4/progtest.m4 + A /branches/0.8.6-bugfix/m4/size_max.m4 + M /branches/0.8.6-bugfix/m4/stdint_h.m4 + M /branches/0.8.6-bugfix/m4/uintmax_t.m4 + M /branches/0.8.6-bugfix/m4/ulonglong.m4 + A /branches/0.8.6-bugfix/m4/visibility.m4 + M /branches/0.8.6-bugfix/m4/vlc.m4 + A /branches/0.8.6-bugfix/m4/wchar_t.m4 + A /branches/0.8.6-bugfix/m4/wint_t.m4 + A /branches/0.8.6-bugfix/m4/xsize.m4 + M /branches/0.8.6-bugfix/po/Makefile.in.in + +Update gettext + +------------------------------------------------------------------------ +r23198 | courmisch | 2007-11-20 19:18:45 +0000 (Tue, 20 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/demux/playlist/m3u.c + +Backport [23197] + +------------------------------------------------------------------------ +r23180 | jb | 2007-11-20 03:27:16 +0000 (Tue, 20 Nov 2007) | 3 lines +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak + +FLAC version has to be 1.2.1... + + +------------------------------------------------------------------------ +r23152 | fkuehne | 2007-11-19 00:09:18 +0000 (Mon, 19 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/about.m + +* fixed platform detection code *coughcough* +------------------------------------------------------------------------ +r23151 | fkuehne | 2007-11-18 23:31:13 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.h + +arf, here'S the header for [23150] +------------------------------------------------------------------------ +r23150 | fkuehne | 2007-11-18 23:30:42 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.m + +* fixed a minor variable conflict +------------------------------------------------------------------------ +r23149 | fkuehne | 2007-11-18 23:15:10 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/src/input/clock.c + +* backport an adapted version of [23117] aka 'Feed synchro with new ref. point after unexpected discontinuity' +------------------------------------------------------------------------ +r23148 | fkuehne | 2007-11-18 23:12:26 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.h + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.m + M /branches/0.8.6-bugfix/modules/gui/macosx/misc.m + +* fixed a minor 10.3.9 compatibility issue, removed some unused variables, etc. pp. +------------------------------------------------------------------------ +r23147 | Trax | 2007-11-18 22:59:35 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* NEWS: add top/bottom field order fix for correct bob/linear deinterlacing +------------------------------------------------------------------------ +r23146 | fkuehne | 2007-11-18 22:33:08 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* another update +------------------------------------------------------------------------ +r23143 | fkuehne | 2007-11-18 21:38:05 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak + +* backport [23142] +------------------------------------------------------------------------ +r23123 | pdherbemont | 2007-11-18 15:32:51 +0000 (Sun, 18 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +Add a NEWS about the suppression of the white flashes artefacts on Mac OS X. + +------------------------------------------------------------------------ +r23121 | pdherbemont | 2007-11-18 15:07:03 +0000 (Sun, 18 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + +gui/macosx/vout.m: Backport fixes about white flashes. + +------------------------------------------------------------------------ +r23120 | pdherbemont | 2007-11-18 15:01:05 +0000 (Sun, 18 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + +Backport more code about [19128]. (Close the embedded window only when playlist stops on Mac OS X). This part make sure the window won't be animated if it is offscreen. + +------------------------------------------------------------------------ +r23119 | pdherbemont | 2007-11-18 14:35:18 +0000 (Sun, 18 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.h + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.m + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + +Backport [19128]. (Close the embedded window only when playlist stops on Mac OS X). + +------------------------------------------------------------------------ +r23116 | fkuehne | 2007-11-18 03:09:21 +0000 (Sun, 18 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/About.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Update.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib + +* use the binary format instead of the text archive, since it is smaller and faster +------------------------------------------------------------------------ +r23115 | pdherbemont | 2007-11-18 00:22:06 +0000 (Sun, 18 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib + M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib + M /branches/0.8.6-bugfix/modules/gui/macosx/controls.m + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.h + M /branches/0.8.6-bugfix/modules/gui/macosx/embeddedwindow.m + M /branches/0.8.6-bugfix/modules/gui/macosx/extended.m + M /branches/0.8.6-bugfix/modules/gui/macosx/interaction.m + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + M /branches/0.8.6-bugfix/modules/gui/macosx/misc.h + M /branches/0.8.6-bugfix/modules/gui/macosx/misc.m + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.h + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + M /branches/0.8.6-bugfix/modules/gui/macosx/voutgl.m + +Mac OS X gui: Backport part of [19115], in order to work around leopard glitches. (quickdraw part ignored for now). (We may need to also back port [19128] "Close the embedded window only when playlist stop."). + +------------------------------------------------------------------------ +r23113 | yoann | 2007-11-17 22:52:19 +0000 (Sat, 17 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/share/Makefile.am + +Backports [19234] + +------------------------------------------------------------------------ +r23112 | damienf | 2007-11-17 22:36:47 +0000 (Sat, 17 Nov 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/activex/plugin.cpp + +activex: fix recursive plugin release, which may cause explorer to crash and opens activex to security exploit as detected by Ricardo Narvaja from Core Security Technologies + +------------------------------------------------------------------------ +r23109 | fkuehne | 2007-11-17 15:58:26 +0000 (Sat, 17 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* re-worded the vout fix news entry (thanks to Trax!) and added a warning about 10.3 compatiblity +------------------------------------------------------------------------ +r23108 | fkuehne | 2007-11-17 15:41:48 +0000 (Sat, 17 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* added some more news for 0.8.6d +------------------------------------------------------------------------ +r23055 | funman | 2007-11-13 17:12:18 +0000 (Tue, 13 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/modules/audio_output/alsa.c + +Backports [23022] +------------------------------------------------------------------------ +r23033 | fkuehne | 2007-11-12 13:00:47 +0000 (Mon, 12 Nov 2007) | 9 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/fspanel.m + M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m + +* backported some fspanel improvements by Pierre (earlier this year) +fspanel.m: + - faster hiding of the curser when the panel vanishes [19133] + - smoother fading [20660] + +vout.m: + - avoid white flashs (10.4+ only) + +Note that "hey, it doesn't appear with Float-on-top" isn't fixed yet. +------------------------------------------------------------------------ +r23032 | fkuehne | 2007-11-12 12:14:09 +0000 (Mon, 12 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj/project.pbxproj + +* ehm, save before committing. here go the MIME types *coughcough* +------------------------------------------------------------------------ +r23031 | fkuehne | 2007-11-12 12:12:13 +0000 (Mon, 12 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj/project.pbxproj + +* added a couple of MIME types (to be forward-ported) and back-ported [22782] (refs #1279) +------------------------------------------------------------------------ +r23030 | fkuehne | 2007-11-12 11:52:15 +0000 (Mon, 12 Nov 2007) | 1 line +Changed paths: + D /branches/0.8.6-bugfix/extras/MacOSX/vlc.pbproj + A /branches/0.8.6-bugfix/extras/MacOSX/vlc.xcodeproj (from /branches/0.8.6-bugfix/extras/MacOSX/vlc.pbproj:22924) + +* renamed the project file to work-around a Xcode 3 restriction +------------------------------------------------------------------------ +r22978 | Trax | 2007-11-06 22:47:49 +0000 (Tue, 06 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/video_filter/deinterlace.c + +* modules/video_filter/deinterlace.c: backport [22579], use field order (top/bottom) for correct bob/linear deinterlacing. +------------------------------------------------------------------------ +r22938 | fkuehne | 2007-11-04 11:56:03 +0000 (Sun, 04 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/about.m + +* show the platform the in the about panel to make end-user-support a bit easier +------------------------------------------------------------------------ +r22925 | fkuehne | 2007-11-01 23:46:45 +0000 (Thu, 01 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* added AR support for Leopard +------------------------------------------------------------------------ +r22924 | funman | 2007-11-01 23:14:41 +0000 (Thu, 01 Nov 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +NEWS: mention the mozilla plugin fix +------------------------------------------------------------------------ +r22894 | fkuehne | 2007-10-29 16:18:55 +0000 (Mon, 29 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/controls.m + +* remove debug +------------------------------------------------------------------------ +r22893 | fkuehne | 2007-10-29 16:11:15 +0000 (Mon, 29 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/AppleRemote.h + M /branches/0.8.6-bugfix/modules/gui/macosx/AppleRemote.m + M /branches/0.8.6-bugfix/modules/gui/macosx/controls.m + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.h + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + +* modernise the Apple Remote architecture by back-porting an adapted trunk version. This fixes the AR support on Tiger and provides a couple of new features (skipping, better volume control, easy to find fullscreen-mode-toggle). additionally, fixed a nasty bug which prevented proper toggling of the fullscreen mode. +------------------------------------------------------------------------ +r22892 | fkuehne | 2007-10-29 15:22:50 +0000 (Mon, 29 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + +* fixed SDK support on Intel-based Macs +------------------------------------------------------------------------ +r22881 | fkuehne | 2007-10-29 00:10:14 +0000 (Mon, 29 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/modules/gui/macosx/AppleRemote.m + +* backport [22872] +------------------------------------------------------------------------ +r22876 | fkuehne | 2007-10-28 23:22:04 +0000 (Sun, 28 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + +* backport [22675] +------------------------------------------------------------------------ +r22873 | fkuehne | 2007-10-28 22:38:59 +0000 (Sun, 28 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak + +* the belnet mirror is broken. Let's use heanet instead +------------------------------------------------------------------------ +r22871 | jpsaman | 2007-10-28 21:40:19 +0000 (Sun, 28 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/Makefile.am + +make [22865] conditinonal for MacOS X only +------------------------------------------------------------------------ +r22865 | jpsaman | 2007-10-27 20:40:39 +0100 (Sat, 27 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/Makefile.am + +Hack to make sure the MacOS X 10.4 linker is used in the last linking stage. +------------------------------------------------------------------------ +r22608 | funman | 2007-10-15 13:51:37 +0100 (Mon, 15 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/extras/contrib/src/Makefile + D /branches/0.8.6-bugfix/extras/contrib/src/Patches/live-starttime.patch + +backports [22276] : fix live555 compilation +------------------------------------------------------------------------ +r22347 | jpsaman | 2007-10-01 07:47:35 +0100 (Mon, 01 Oct 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/src/osd/osd.c + +Backport of [22325]: Fixed tiny race condition. +------------------------------------------------------------------------ +r22338 | funman | 2007-09-30 23:04:26 +0100 (Sun, 30 Sep 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/mozilla/npvlc_rc.rc + +mozilla: backports windows mime types definitions from trunk, closes #1093 +------------------------------------------------------------------------ +r22307 | courmisch | 2007-09-29 11:14:47 +0100 (Sat, 29 Sep 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/po/POTFILES.in + +Fix make dist + +------------------------------------------------------------------------ +r22108 | courmisch | 2007-09-16 20:19:06 +0100 (Sun, 16 Sep 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/modules/access/pvr.c + +Backport videodev2 include fix - closes #1238 + +------------------------------------------------------------------------ +r22024 | courmisch | 2007-09-15 10:58:59 +0100 (Sat, 15 Sep 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/control/rc.c + M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m + M /branches/0.8.6-bugfix/modules/gui/wxwidgets/dialogs.cpp + +Disable auto-update. + +------------------------------------------------------------------------ +r22023 | courmisch | 2007-09-15 10:51:34 +0100 (Sat, 15 Sep 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/misc/rtsp.c + M /branches/0.8.6-bugfix/modules/stream_out/rtp.c + +Fix remote DoS in RTSP code + +------------------------------------------------------------------------ +r21542 | jpsaman | 2007-08-28 12:05:11 +0100 (Tue, 28 Aug 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/configure.ac + +Remove reference to corba Makefile from configure.ac +------------------------------------------------------------------------ +r21308 | oaubert | 2007-08-20 14:16:55 +0100 (Mon, 20 Aug 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/MAINTAINERS + M /branches/0.8.6-bugfix/configure.ac + D /branches/0.8.6-bugfix/modules/control/corba + M /branches/0.8.6-bugfix/vlc.roku + +Remove outdated corba control module + +------------------------------------------------------------------------ +r20913 | thresh | 2007-07-30 08:51:32 +0100 (Mon, 30 Jul 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/include/codecs.h + +Backport #19003. Should fix AAC-in-AVI decoding with files created by ffmpeg/mencoder. + +------------------------------------------------------------------------ +r20737 | fkuehne | 2007-07-04 20:43:22 +0100 (Wed, 04 Jul 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/po/sv.po + +* "%i objekt i spellistan" as translation for "No items in the playlist" may trigger unexpected UI strings on OSX. I've removed that translation for now, but we should get a correct translation for the release. Fixes #1234 +------------------------------------------------------------------------ +r20718 | xtophe | 2007-06-30 00:59:29 +0100 (Sat, 30 Jun 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/po/ro.po + +Update of the romanian l10n by Cristian Secar?\196?\131 + +------------------------------------------------------------------------ +r20696 | fkuehne | 2007-06-26 19:59:26 +0100 (Tue, 26 Jun 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/Makefile.am + +* backport [20695] +------------------------------------------------------------------------ +r20692 | xtophe | 2007-06-25 23:48:02 +0100 (Mon, 25 Jun 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/THANKS + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/po/pl.po + M /branches/0.8.6-bugfix/po/vlc.pot + M /branches/0.8.6-bugfix/src/libvlc.h + M /branches/0.8.6-bugfix/src/misc/darwin_specific.m + +Polish translation for 0.8.6-bugfix branch by Micha?\197?\130 Trzebiatowski. + +------------------------------------------------------------------------ +r20658 | courmisch | 2007-06-22 08:09:18 +0100 (Fri, 22 Jun 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +Add CVE reference + +------------------------------------------------------------------------ +r20619 | dionoea | 2007-06-18 20:56:45 +0100 (Mon, 18 Jun 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/NEWS + M /branches/0.8.6-bugfix/configure.ac + M /branches/0.8.6-bugfix/src/input/input.c + +* backport [20618] to stable branch (in case we release it one day). + +------------------------------------------------------------------------ +r20585 | sigmunau | 2007-06-16 14:34:18 +0100 (Sat, 16 Jun 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/modules/access/Modules.am + +fix make dist + +------------------------------------------------------------------------ +r20584 | Trax | 2007-06-16 14:19:41 +0100 (Sat, 16 Jun 2007) | 1 line +Changed paths: + M /branches/0.8.6-bugfix/NEWS + +* NEWS: add FLAC and v4l2 API info +------------------------------------------------------------------------ +r20580 | jb | 2007-06-16 11:28:25 +0100 (Sat, 16 Jun 2007) | 2 lines +Changed paths: + M /branches/0.8.6-bugfix/ChangeLog + +More Changelogs. + +------------------------------------------------------------------------ +r20579 | jpsaman | 2007-06-16 11:11:51 +0100 (Sat, 16 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/misc/freetype.c Fix potential memleaks ------------------------------------------------------------------------ -r20573 | xtophe | 2007-06-15 00:45:57 +0200 (Fri, 15 Jun 2007) | 2 lines +r20573 | xtophe | 2007-06-14 23:45:57 +0100 (Thu, 14 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/THANKS M /branches/0.8.6-bugfix/modules/codec/flac.c @@ -13,45 +1666,45 @@ New FLAC API compatibility. Backport of [18855] and [18858] ------------------------------------------------------------------------ -r20571 | xtophe | 2007-06-15 00:02:46 +0200 (Fri, 15 Jun 2007) | 2 lines +r20571 | xtophe | 2007-06-14 23:02:46 +0100 (Thu, 14 Jun 2007) | 2 lines Changed paths: A /branches/0.8.6-bugfix/modules/access/videodev2.h (from /branches/0.8.6-bugfix/modules/access/pvr/videodev2.h:20507) This file was forgotten in [20508] ------------------------------------------------------------------------ -r20569 | Trax | 2007-06-14 20:11:16 +0200 (Thu, 14 Jun 2007) | 1 line +r20569 | Trax | 2007-06-14 19:11:16 +0100 (Thu, 14 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/video_output/vout_subpictures.c * src/video_output/vout_subpictures.c: backport [20562], potential memleak/crash ------------------------------------------------------------------------ -r20568 | xtophe | 2007-06-14 19:42:14 +0200 (Thu, 14 Jun 2007) | 2 lines +r20568 | xtophe | 2007-06-14 18:42:14 +0100 (Thu, 14 Jun 2007) | 2 lines Changed paths: A /branches/0.8.6-bugfix/po/fa.po oups forgot that yesterday ------------------------------------------------------------------------ -r20566 | Trax | 2007-06-14 19:29:46 +0200 (Thu, 14 Jun 2007) | 1 line +r20566 | Trax | 2007-06-14 18:29:46 +0100 (Thu, 14 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS * NEWS: more cosmetics :) ------------------------------------------------------------------------ -r20564 | Trax | 2007-06-14 19:21:29 +0200 (Thu, 14 Jun 2007) | 1 line +r20564 | Trax | 2007-06-14 18:21:29 +0100 (Thu, 14 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS * NEWS: cosmetics.. ------------------------------------------------------------------------ -r20563 | Trax | 2007-06-14 19:16:25 +0200 (Thu, 14 Jun 2007) | 1 line +r20563 | Trax | 2007-06-14 18:16:25 +0100 (Thu, 14 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS * NEWS: changed description for subtitle detection fix in AVI ------------------------------------------------------------------------ -r20559 | jb | 2007-06-14 01:45:26 +0200 (Thu, 14 Jun 2007) | 3 lines +r20559 | jb | 2007-06-14 00:45:26 +0100 (Thu, 14 Jun 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/ChangeLog A /branches/0.8.6-bugfix/doc/ChangeLog-2006 @@ -60,7 +1713,7 @@ ------------------------------------------------------------------------ -r20558 | jb | 2007-06-14 01:42:57 +0200 (Thu, 14 Jun 2007) | 4 lines +r20558 | jb | 2007-06-14 00:42:57 +0100 (Thu, 14 Jun 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/INSTALL.win32 M /branches/0.8.6-bugfix/configure.ac @@ -70,14 +1723,14 @@ ------------------------------------------------------------------------ ------------------------------------------------------------------------ -r20555 | xtophe | 2007-06-13 23:47:43 +0200 (Wed, 13 Jun 2007) | 2 lines +r20555 | xtophe | 2007-06-13 22:47:43 +0100 (Wed, 13 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/plugin/InstallerInfo.plist Changes the version string ------------------------------------------------------------------------ -r20554 | xtophe | 2007-06-13 23:34:20 +0200 (Wed, 13 Jun 2007) | 2 lines +r20554 | xtophe | 2007-06-13 22:34:20 +0100 (Wed, 13 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/NEWS M /branches/0.8.6-bugfix/THANKS @@ -138,146 +1791,146 @@ Backport the l10n from trunk, activate arabic and persian ------------------------------------------------------------------------ -r20552 | fenrir | 2007-06-13 21:27:36 +0200 (Wed, 13 Jun 2007) | 2 lines +r20552 | fenrir | 2007-06-13 20:27:36 +0100 (Wed, 13 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/aiff.c Backport [20551] (stereo + odd chunk size) ------------------------------------------------------------------------ -r20542 | Trax | 2007-06-12 23:19:23 +0200 (Tue, 12 Jun 2007) | 1 line +r20542 | Trax | 2007-06-12 22:19:23 +0100 (Tue, 12 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/wxwidgets/interface.cpp * modules/gui/wxwidgets/interface.cpp: Revert [20519] as time display is a bit too wide now (at least on XP, the defaults were fine). Needs more tweaking to be properly backported. ------------------------------------------------------------------------ -r20540 | Trax | 2007-06-12 22:31:04 +0200 (Tue, 12 Jun 2007) | 1 line +r20540 | Trax | 2007-06-12 21:31:04 +0100 (Tue, 12 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS NEWS: add security updates. ------------------------------------------------------------------------ -r20537 | fenrir | 2007-06-12 20:32:04 +0200 (Tue, 12 Jun 2007) | 2 lines +r20537 | fenrir | 2007-06-12 19:32:04 +0100 (Tue, 12 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/access/http.c Backport [20328] (Do not forbid seeking on 401 error.) ------------------------------------------------------------------------ -r20536 | fenrir | 2007-06-12 20:28:40 +0200 (Tue, 12 Jun 2007) | 2 lines +r20536 | fenrir | 2007-06-12 19:28:40 +0100 (Tue, 12 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/playlist/m3u.c Backport [20311] (m3u length parsing, BUT it is incomplete as it will break ABI) ------------------------------------------------------------------------ -r20535 | fenrir | 2007-06-12 20:27:18 +0200 (Tue, 12 Jun 2007) | 2 lines +r20535 | fenrir | 2007-06-12 19:27:18 +0100 (Tue, 12 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/audio_output/output.c Backport [20534] (Use of released buffer on race condition) ------------------------------------------------------------------------ -r20533 | Trax | 2007-06-12 20:19:09 +0200 (Tue, 12 Jun 2007) | 1 line +r20533 | Trax | 2007-06-12 19:19:09 +0100 (Tue, 12 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/osd/osd_parser.c * src/osd/osd_parser.c: backport [20349], remove dead code. ------------------------------------------------------------------------ -r20532 | Trax | 2007-06-12 19:04:06 +0200 (Tue, 12 Jun 2007) | 1 line +r20532 | Trax | 2007-06-12 18:04:06 +0100 (Tue, 12 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS NEWS: add MKV demuxer crash fix. ------------------------------------------------------------------------ -r20531 | Trax | 2007-06-12 18:58:30 +0200 (Tue, 12 Jun 2007) | 1 line +r20531 | Trax | 2007-06-12 17:58:30 +0100 (Tue, 12 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/THANKS M /branches/0.8.6-bugfix/modules/demux/rawdv.c * modules/demux/rawdv.c: backport [19931], patch for rawdv and fix memleak. ------------------------------------------------------------------------ -r20530 | Trax | 2007-06-12 18:40:27 +0200 (Tue, 12 Jun 2007) | 1 line +r20530 | Trax | 2007-06-12 17:40:27 +0100 (Tue, 12 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/osd/osd.c M /branches/0.8.6-bugfix/src/osd/osd_parser.c * src/osd/osd.c osd_parser.c: backport [20352], Fix memleaks. ------------------------------------------------------------------------ -r20529 | Trax | 2007-06-12 18:31:11 +0200 (Tue, 12 Jun 2007) | 1 line +r20529 | Trax | 2007-06-12 17:31:11 +0100 (Tue, 12 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/THANKS M /branches/0.8.6-bugfix/modules/demux/mkv.cpp * modules/demux/mkv.cpp: backport [20041], Fix im MKV demuxer. ------------------------------------------------------------------------ -r20528 | damienf | 2007-06-12 18:10:37 +0200 (Tue, 12 Jun 2007) | 2 lines +r20528 | damienf | 2007-06-12 17:10:37 +0100 (Tue, 12 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/mozilla/vlcshell.cpp mozilla: backport [20527] ------------------------------------------------------------------------ -r20522 | damienf | 2007-06-12 11:06:50 +0200 (Tue, 12 Jun 2007) | 2 lines +r20522 | damienf | 2007-06-12 10:06:50 +0100 (Tue, 12 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/vlc.win32.nsi.in NSIS installer: fixed small typo in mozilla registry key ------------------------------------------------------------------------ -r20519 | Trax | 2007-06-11 22:28:02 +0200 (Mon, 11 Jun 2007) | 1 line +r20519 | Trax | 2007-06-11 21:28:02 +0100 (Mon, 11 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/wxwidgets/interface.cpp * modules/gui/wxwidgets/interface.cpp: Backport [19972], Wx - increase the time display. ------------------------------------------------------------------------ -r20517 | Trax | 2007-06-11 17:57:39 +0200 (Mon, 11 Jun 2007) | 1 line +r20517 | Trax | 2007-06-11 16:57:39 +0100 (Mon, 11 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS * NEWS: Added fixes for memory leaks and Embedded subtitles (GAB2) ------------------------------------------------------------------------ -r20516 | Trax | 2007-06-11 17:45:34 +0200 (Mon, 11 Jun 2007) | 1 line +r20516 | Trax | 2007-06-11 16:45:34 +0100 (Mon, 11 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/misc/svg.c * modules/misc/svg.c: Backport [20353], Fix memleak ------------------------------------------------------------------------ -r20515 | Trax | 2007-06-11 17:38:59 +0200 (Mon, 11 Jun 2007) | 1 line +r20515 | Trax | 2007-06-11 16:38:59 +0100 (Mon, 11 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/demux/avi/libavi.c * modules/demux/avi/linavi.c: Backport [19904], Patch to fix ticket #1162 by npl at chello.at ------------------------------------------------------------------------ -r20513 | damienf | 2007-06-11 16:23:41 +0200 (Mon, 11 Jun 2007) | 2 lines +r20513 | damienf | 2007-06-11 15:23:41 +0100 (Mon, 11 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/NEWS NEWS: more Direct3D news ------------------------------------------------------------------------ -r20512 | damienf | 2007-06-11 14:53:18 +0200 (Mon, 11 Jun 2007) | 2 lines +r20512 | damienf | 2007-06-11 13:53:18 +0100 (Mon, 11 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/live555.cpp live555: backport [19973] ------------------------------------------------------------------------ -r20511 | damienf | 2007-06-11 14:48:31 +0200 (Mon, 11 Jun 2007) | 2 lines +r20511 | damienf | 2007-06-11 13:48:31 +0100 (Mon, 11 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/libmpeg2.c libmpeg2: backport [20298] ------------------------------------------------------------------------ -r20510 | damienf | 2007-06-11 14:45:39 +0200 (Mon, 11 Jun 2007) | 2 lines +r20510 | damienf | 2007-06-11 13:45:39 +0100 (Mon, 11 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/ffmpeg/video.c ffmpeg: backport [20343] ------------------------------------------------------------------------ -r20509 | damienf | 2007-06-11 14:28:43 +0200 (Mon, 11 Jun 2007) | 2 lines +r20509 | damienf | 2007-06-11 13:28:43 +0100 (Mon, 11 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/directx/direct3d.c M /branches/0.8.6-bugfix/modules/video_output/directx/events.c @@ -285,7 +1938,7 @@ directx: backport [20153], and stay on top fix in [20028] ------------------------------------------------------------------------ -r20508 | sigmunau | 2007-06-11 14:03:55 +0200 (Mon, 11 Jun 2007) | 3 lines +r20508 | sigmunau | 2007-06-11 13:03:55 +0100 (Mon, 11 Jun 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/THANKS M /branches/0.8.6-bugfix/configure.ac @@ -297,14 +1950,14 @@ encoder api. ------------------------------------------------------------------------ -r20506 | damienf | 2007-06-11 13:37:38 +0200 (Mon, 11 Jun 2007) | 2 lines +r20506 | damienf | 2007-06-11 12:37:38 +0100 (Mon, 11 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/wxwidgets/input_manager.cpp wxwidgets: backport [20017] ------------------------------------------------------------------------ -r20505 | damienf | 2007-06-11 13:21:05 +0200 (Mon, 11 Jun 2007) | 2 lines +r20505 | damienf | 2007-06-11 12:21:05 +0100 (Mon, 11 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_chroma/i420_rgb16.c M /branches/0.8.6-bugfix/modules/video_chroma/i420_yuy2.c @@ -313,48 +1966,48 @@ MMX chromas: removed MMX registers from clobbered list as it causes errors on some version of GCC not properly configured for MMX (Gentoo ?) ------------------------------------------------------------------------ -r20501 | pdherbemont | 2007-06-10 22:10:40 +0200 (Sun, 10 Jun 2007) | 2 lines +r20501 | pdherbemont | 2007-06-10 21:10:40 +0100 (Sun, 10 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/control/core.c Backport [20379]. control/core.c: Don't leak the p_instance. ------------------------------------------------------------------------ -r20496 | dionoea | 2007-06-10 17:32:56 +0200 (Sun, 10 Jun 2007) | 2 lines +r20496 | dionoea | 2007-06-10 16:32:56 +0100 (Sun, 10 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/ffmpeg/demux.c Backport [20188]. "ffmpeg/demux.c: Don't change an ffmpeg demux's .flags member permanently. Fixes the "ffmpeg demuxer can't be used more that once" bug with libavformat revisions newer than 7589 (included)." ------------------------------------------------------------------------ -r20495 | courmisch | 2007-06-10 17:27:51 +0200 (Sun, 10 Jun 2007) | 2 lines +r20495 | courmisch | 2007-06-10 16:27:51 +0100 (Sun, 10 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/misc/strings.c Backport [19981]: handle NULL in decode_URI and unescape_URI ------------------------------------------------------------------------ -r20494 | dionoea | 2007-06-10 15:16:34 +0200 (Sun, 10 Jun 2007) | 2 lines +r20494 | dionoea | 2007-06-10 14:16:34 +0100 (Sun, 10 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/NEWS Start adding some NEWS. ------------------------------------------------------------------------ -r20493 | dionoea | 2007-06-10 15:10:29 +0200 (Sun, 10 Jun 2007) | 2 lines +r20493 | dionoea | 2007-06-10 14:10:29 +0100 (Sun, 10 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_filter/rss.c Backport rss bugfix for missing 0 char at the end of the string [20038]. ------------------------------------------------------------------------ -r20491 | fkuehne | 2007-06-09 18:50:22 +0200 (Sat, 09 Jun 2007) | 1 line +r20491 | fkuehne | 2007-06-09 17:50:22 +0100 (Sat, 09 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak * libcddb is broken on sf's switch server. let's use heanet instead. ------------------------------------------------------------------------ -r20490 | pdherbemont | 2007-06-09 17:36:51 +0200 (Sat, 09 Jun 2007) | 2 lines +r20490 | pdherbemont | 2007-06-09 16:36:51 +0100 (Sat, 09 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/intf.h M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m @@ -364,7 +2017,7 @@ Mac OS X gui: Hopefuly fix the fullscreen change crash by back porting the NSView main thread creation fix. ------------------------------------------------------------------------ -r20484 | fkuehne | 2007-06-08 17:11:44 +0200 (Fri, 08 Jun 2007) | 1 line +r20484 | fkuehne | 2007-06-08 16:11:44 +0100 (Fri, 08 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/InfoPlist.strings M /branches/0.8.6-bugfix/extras/MacOSX/plugin/English.lproj/InfoPlist.strings @@ -373,7 +2026,7 @@ * updated to *c ------------------------------------------------------------------------ -r20480 | fkuehne | 2007-06-08 16:22:20 +0200 (Fri, 08 Jun 2007) | 1 line +r20480 | fkuehne | 2007-06-08 15:22:20 +0100 (Fri, 08 Jun 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile A /branches/0.8.6-bugfix/extras/contrib/src/Patches/live-config.patch @@ -384,7 +2037,7 @@ * update live building, removed support for compilation on OSX < 10.4 and included the current patches ------------------------------------------------------------------------ -r20474 | damienf | 2007-06-08 01:44:35 +0200 (Fri, 08 Jun 2007) | 2 lines +r20474 | damienf | 2007-06-08 00:44:35 +0100 (Fri, 08 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/directx/direct3d.c M /branches/0.8.6-bugfix/modules/video_output/directx/events.c @@ -392,7 +2045,7 @@ - direct3d: backport [20420],[20412],[19993] ------------------------------------------------------------------------ -r20471 | damienf | 2007-06-08 00:57:09 +0200 (Fri, 08 Jun 2007) | 2 lines +r20471 | damienf | 2007-06-07 23:57:09 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_chroma/i420_rgb16.c M /branches/0.8.6-bugfix/modules/video_chroma/i420_yuy2.c @@ -401,28 +2054,28 @@ video_chroma: re-enable FPU registers after using MMX instructions ------------------------------------------------------------------------ -r20469 | xtophe | 2007-06-08 00:32:10 +0200 (Fri, 08 Jun 2007) | 2 lines +r20469 | xtophe | 2007-06-07 23:32:10 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/doc/vlc.1 Backport [19419], [20466] and partially [20468] ------------------------------------------------------------------------ -r20458 | courmisch | 2007-06-07 20:50:00 +0200 (Thu, 07 Jun 2007) | 2 lines +r20458 | courmisch | 2007-06-07 19:50:00 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/bootstrap Quick hack to support automake 1.10 ------------------------------------------------------------------------ -r20457 | courmisch | 2007-06-07 20:47:35 +0200 (Thu, 07 Jun 2007) | 2 lines +r20457 | courmisch | 2007-06-07 19:47:35 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/bindings/java/src svn:ignore ------------------------------------------------------------------------ -r20455 | courmisch | 2007-06-07 19:34:50 +0200 (Thu, 07 Jun 2007) | 2 lines +r20455 | courmisch | 2007-06-07 18:34:50 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/access/cdda.c M /branches/0.8.6-bugfix/modules/services_discovery/sap.c @@ -430,21 +2083,21 @@ Backport [20454] and [20448] ------------------------------------------------------------------------ -r20453 | courmisch | 2007-06-07 19:32:36 +0200 (Thu, 07 Jun 2007) | 2 lines +r20453 | courmisch | 2007-06-07 18:32:36 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/theora.c Backport [20452] ------------------------------------------------------------------------ -r20449 | courmisch | 2007-06-07 19:31:10 +0200 (Thu, 07 Jun 2007) | 2 lines +r20449 | courmisch | 2007-06-07 18:31:10 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/vorbis.c Fix format string usage. Problem reported by David Thiel. ------------------------------------------------------------------------ -r20447 | courmisch | 2007-06-07 18:58:32 +0200 (Thu, 07 Jun 2007) | 2 lines +r20447 | courmisch | 2007-06-07 17:58:32 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/THANKS M /branches/0.8.6-bugfix/src/audio_output/dec.c @@ -452,35 +2105,35 @@ Sanitize audio format ------------------------------------------------------------------------ -r20445 | courmisch | 2007-06-07 18:57:15 +0200 (Thu, 07 Jun 2007) | 2 lines +r20445 | courmisch | 2007-06-07 17:57:15 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/audio_output/input.c Partial backport of [20441]: unitialized variable ------------------------------------------------------------------------ -r20444 | courmisch | 2007-06-07 18:55:46 +0200 (Thu, 07 Jun 2007) | 2 lines +r20444 | courmisch | 2007-06-07 17:55:46 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/audio_output/dec.c Backport [20439]: deadlock ------------------------------------------------------------------------ -r20443 | courmisch | 2007-06-07 18:55:08 +0200 (Thu, 07 Jun 2007) | 2 lines +r20443 | courmisch | 2007-06-07 17:55:08 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/include/vlc_es.h Use unsigned. Retain layout and byte size due to ABI freeze. ------------------------------------------------------------------------ -r20435 | courmisch | 2007-06-07 18:09:09 +0200 (Thu, 07 Jun 2007) | 2 lines +r20435 | courmisch | 2007-06-07 17:09:09 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/wav.c Backport [20434] ------------------------------------------------------------------------ -r20433 | courmisch | 2007-06-07 17:33:23 +0200 (Thu, 07 Jun 2007) | 2 lines +r20433 | courmisch | 2007-06-07 16:33:23 +0100 (Thu, 07 Jun 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/NEWS M /branches/0.8.6-bugfix/configure.ac @@ -488,14 +2141,14 @@ Open 0.8.6c for business ------------------------------------------------------------------------ -r20192 | courmisch | 2007-05-19 11:42:41 +0200 (Sat, 19 May 2007) | 2 lines +r20192 | courmisch | 2007-05-19 10:42:41 +0100 (Sat, 19 May 2007) | 2 lines Changed paths: A /branches/0.8.6-bugfix (from /branches/0.8.6-bugfix:19864) Not every bug have been fixed right? so why REMOVE the bugfix BRANCH ? ------------------------------------------------------------------------ -r19864 | damienf | 2007-04-18 18:30:27 +0200 (Wed, 18 Apr 2007) | 2 lines +r19864 | damienf | 2007-04-18 17:30:27 +0100 (Wed, 18 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/activex/axvlc.tlb M /branches/0.8.6-bugfix/activex/axvlc_idl.c @@ -504,13 +2157,13 @@ - activex: use Microsoft MIDL compiler to compile IDL for backward compatibility ------------------------------------------------------------------------ -r19862 | fkuehne | 2007-04-17 23:47:22 +0200 (Tue, 17 Apr 2007) | 1 line +r19862 | fkuehne | 2007-04-17 22:47:22 +0100 (Tue, 17 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/ChangeLog * updated the changelog ------------------------------------------------------------------------ -r19861 | fkuehne | 2007-04-17 23:43:59 +0200 (Tue, 17 Apr 2007) | 1 line +r19861 | fkuehne | 2007-04-17 22:43:59 +0100 (Tue, 17 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS M /branches/0.8.6-bugfix/configure.ac @@ -521,46 +2174,46 @@ * prepare for release :) ------------------------------------------------------------------------ -r19810 | md | 2007-04-15 11:52:35 +0200 (Sun, 15 Apr 2007) | 2 lines +r19810 | md | 2007-04-15 10:52:35 +0100 (Sun, 15 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/access/udp.c Fix error in backport of [18891] - Closes #1171 ------------------------------------------------------------------------ -r19808 | courmisch | 2007-04-15 10:52:35 +0200 (Sun, 15 Apr 2007) | 2 lines +r19808 | courmisch | 2007-04-15 09:52:35 +0100 (Sun, 15 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/control/rc.c Backport [19806] and [19807]: remove rc-fake-tty and rc-unix from Win32 ------------------------------------------------------------------------ -r19803 | courmisch | 2007-04-15 08:46:21 +0200 (Sun, 15 Apr 2007) | 2 lines +r19803 | courmisch | 2007-04-15 07:46:21 +0100 (Sun, 15 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/misc/gnutls.c Backport [19802]: double CRT deinit ------------------------------------------------------------------------ -r19783 | Trax | 2007-04-14 14:50:35 +0200 (Sat, 14 Apr 2007) | 1 line +r19783 | Trax | 2007-04-14 13:50:35 +0100 (Sat, 14 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS NEWS: some very important grammar fixes... ------------------------------------------------------------------------ -r19778 | Trax | 2007-04-12 22:39:18 +0200 (Thu, 12 Apr 2007) | 1 line +r19778 | Trax | 2007-04-12 21:39:18 +0100 (Thu, 12 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS NEWS: add note about fixed behaviour for shoutcast/icecast output. ------------------------------------------------------------------------ -r19777 | Trax | 2007-04-12 21:15:48 +0200 (Thu, 12 Apr 2007) | 1 line +r19777 | Trax | 2007-04-12 20:15:48 +0100 (Thu, 12 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/access_output/shout.c * modules/access_output/shout.c: Make ICY the default protocol and set protocol rollover from shoutcast to icecast. This fixes some libshout Socket error messages. Refs #1003. Partly backported from [19745]. ------------------------------------------------------------------------ -r19775 | courmisch | 2007-04-12 19:30:41 +0200 (Thu, 12 Apr 2007) | 8 lines +r19775 | courmisch | 2007-04-12 18:30:41 +0100 (Thu, 12 Apr 2007) | 8 lines Changed paths: M /branches/0.8.6-bugfix/modules/services_discovery/sap.c @@ -573,7 +2226,7 @@ without backporting the all refactored code. Needs testing (ECP people?). ------------------------------------------------------------------------ -r19774 | fkuehne | 2007-04-12 19:18:31 +0200 (Thu, 12 Apr 2007) | 1 line +r19774 | fkuehne | 2007-04-12 18:18:31 +0100 (Thu, 12 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/configure.ac M /branches/0.8.6-bugfix/extras/MacOSX/plugin/English.lproj/InfoPlist.strings @@ -583,7 +2236,7 @@ * prepare for test1 and also update the plugin info (it's 2007.. ;) ------------------------------------------------------------------------ -r19773 | courmisch | 2007-04-12 19:03:00 +0200 (Thu, 12 Apr 2007) | 3 lines +r19773 | courmisch | 2007-04-12 18:03:00 +0100 (Thu, 12 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/modules/services_discovery/sap.c @@ -591,14 +2244,14 @@ i.e. do not add them around DNS hostnames ------------------------------------------------------------------------ -r19772 | courmisch | 2007-04-12 19:00:34 +0200 (Thu, 12 Apr 2007) | 2 lines +r19772 | courmisch | 2007-04-12 18:00:34 +0100 (Thu, 12 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/services_discovery/sap.c Relax c= parsing so that it does not reject valid IPv6 announces ------------------------------------------------------------------------ -r19771 | jb | 2007-04-12 18:55:51 +0200 (Thu, 12 Apr 2007) | 3 lines +r19771 | jb | 2007-04-12 17:55:51 +0100 (Thu, 12 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/NEWS @@ -606,7 +2259,7 @@ ------------------------------------------------------------------------ -r19769 | jb | 2007-04-12 18:14:33 +0200 (Thu, 12 Apr 2007) | 3 lines +r19769 | jb | 2007-04-12 17:14:33 +0100 (Thu, 12 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/modules/access/dvb/en50221.c @@ -614,13 +2267,13 @@ ------------------------------------------------------------------------ -r19765 | jpsaman | 2007-04-12 11:41:58 +0200 (Thu, 12 Apr 2007) | 1 line +r19765 | jpsaman | 2007-04-12 10:41:58 +0100 (Thu, 12 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/extras/libc.c Backport of rev [19271] ------------------------------------------------------------------------ -r19761 | damienf | 2007-04-11 23:27:39 +0200 (Wed, 11 Apr 2007) | 2 lines +r19761 | damienf | 2007-04-11 22:27:39 +0100 (Wed, 11 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/directx/direct3d.c M /branches/0.8.6-bugfix/modules/video_output/directx/vout.h @@ -628,41 +2281,41 @@ - direct3d: backported texture to quad video rendering code from trunk, that seems a better option for Vista ------------------------------------------------------------------------ -r19759 | damienf | 2007-04-11 00:40:50 +0200 (Wed, 11 Apr 2007) | 2 lines +r19759 | damienf | 2007-04-10 23:40:50 +0100 (Tue, 10 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/directx/direct3d.c - direct3d: try Vista workaround documented in VirtualDub blog ------------------------------------------------------------------------ -r19758 | damienf | 2007-04-10 23:43:29 +0200 (Tue, 10 Apr 2007) | 2 lines +r19758 | damienf | 2007-04-10 22:43:29 +0100 (Tue, 10 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/directx/direct3d.c - direct3d: more possible Vista fixes, needs testing ------------------------------------------------------------------------ -r19751 | fkuehne | 2007-04-09 20:33:45 +0200 (Mon, 09 Apr 2007) | 1 line +r19751 | fkuehne | 2007-04-09 19:33:45 +0100 (Mon, 09 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/libvlc.h * default enable interface interactions. feel free to give reasons to disable it again on non-mac platforms ------------------------------------------------------------------------ -r19750 | courmisch | 2007-04-09 17:15:59 +0200 (Mon, 09 Apr 2007) | 2 lines +r19750 | courmisch | 2007-04-09 16:15:59 +0100 (Mon, 09 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/stream_out/rtp.c Backport [19749]: b= SDP ordering fix ------------------------------------------------------------------------ -r19748 | courmisch | 2007-04-09 17:10:40 +0200 (Mon, 09 Apr 2007) | 2 lines +r19748 | courmisch | 2007-04-09 16:10:40 +0100 (Mon, 09 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/stream_out/rtp.c Backport [19747]: IPv6 SDP TTL removal ------------------------------------------------------------------------ -r19729 | damienf | 2007-04-07 01:09:20 +0200 (Sat, 07 Apr 2007) | 2 lines +r19729 | damienf | 2007-04-07 00:09:20 +0100 (Sat, 07 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/directx/direct3d.c M /branches/0.8.6-bugfix/modules/video_output/directx/directx.c @@ -671,14 +2324,14 @@ - directx vout: misc bug fixes ------------------------------------------------------------------------ -r19721 | massiot | 2007-04-06 20:12:06 +0200 (Fri, 06 Apr 2007) | 2 lines +r19721 | massiot | 2007-04-06 19:12:06 +0100 (Fri, 06 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/NEWS * NEWS : Added teletext decoder. ------------------------------------------------------------------------ -r19719 | massiot | 2007-04-06 20:03:48 +0200 (Fri, 06 Apr 2007) | 5 lines +r19719 | massiot | 2007-04-06 19:03:48 +0100 (Fri, 06 Apr 2007) | 5 lines Changed paths: M /branches/0.8.6-bugfix/AUTHORS M /branches/0.8.6-bugfix/configure.ac @@ -695,7 +2348,7 @@ [18633] [19717] ------------------------------------------------------------------------ -r19716 | jb | 2007-04-06 18:23:23 +0200 (Fri, 06 Apr 2007) | 3 lines +r19716 | jb | 2007-04-06 17:23:23 +0100 (Fri, 06 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/NEWS @@ -703,32 +2356,32 @@ ------------------------------------------------------------------------ -r19715 | fkuehne | 2007-04-06 18:02:54 +0200 (Fri, 06 Apr 2007) | 1 line +r19715 | fkuehne | 2007-04-06 17:02:54 +0100 (Fri, 06 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS * updated the news a bit ------------------------------------------------------------------------ -r19712 | fkuehne | 2007-04-06 16:51:26 +0200 (Fri, 06 Apr 2007) | 1 line +r19712 | fkuehne | 2007-04-06 15:51:26 +0100 (Fri, 06 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile * libdca: use revision 35 instead of the latest possible, since that one is broken and since we want to mostly use 0.8.6a's contribs for 0.8.6b ------------------------------------------------------------------------ -r19667 | fkuehne | 2007-04-04 22:24:46 +0200 (Wed, 04 Apr 2007) | 1 line +r19667 | fkuehne | 2007-04-04 21:24:46 +0100 (Wed, 04 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m * make sure that the fspanel is being actived in all possible vout-goes-fullscreen ways (closes #1132) ------------------------------------------------------------------------ -r19664 | courmisch | 2007-04-04 16:29:10 +0200 (Wed, 04 Apr 2007) | 2 lines +r19664 | courmisch | 2007-04-04 15:29:10 +0100 (Wed, 04 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/skins2/x11/x11_window.cpp Revert fix-revert ------------------------------------------------------------------------ -r19663 | lool | 2007-04-04 16:21:33 +0200 (Wed, 04 Apr 2007) | 4 lines +r19663 | lool | 2007-04-04 15:21:33 +0100 (Wed, 04 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/skins2/src/theme_loader.cpp @@ -737,7 +2390,7 @@ Martin Michlmayr; Debian #417750. ------------------------------------------------------------------------ -r19657 | jb | 2007-04-03 23:23:26 +0200 (Tue, 03 Apr 2007) | 3 lines +r19657 | jb | 2007-04-03 22:23:26 +0100 (Tue, 03 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/ffmpeg/ffmpeg.c M /branches/0.8.6-bugfix/modules/demux/nsv.c @@ -746,13 +2399,13 @@ ------------------------------------------------------------------------ -r19652 | jpsaman | 2007-04-03 13:27:47 +0200 (Tue, 03 Apr 2007) | 1 line +r19652 | jpsaman | 2007-04-03 12:27:47 +0100 (Tue, 03 Apr 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/activex/vlccontrol2.cpp Backport of rev [19651] ------------------------------------------------------------------------ -r19648 | pdherbemont | 2007-04-03 00:47:28 +0200 (Tue, 03 Apr 2007) | 4 lines +r19648 | pdherbemont | 2007-04-02 23:47:28 +0100 (Mon, 02 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m @@ -761,14 +2414,14 @@ Mac OS X gui: Fix a crash when asking for fullscreen state when no p_real_vout is defined. ------------------------------------------------------------------------ -r19645 | dionoea | 2007-04-03 00:01:01 +0200 (Tue, 03 Apr 2007) | 2 lines +r19645 | dionoea | 2007-04-02 23:01:01 +0100 (Mon, 02 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/playlist/item-ext.c Fix 0.8.6 only bug reported by fireblade on the forums ( http://forum.videolan.org/viewtopic.php?p=106488 ). ------------------------------------------------------------------------ -r19628 | jb | 2007-04-01 20:06:10 +0200 (Sun, 01 Apr 2007) | 3 lines +r19628 | jb | 2007-04-01 19:06:10 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/po/POTFILES.in M /branches/0.8.6-bugfix/po/vlc.pot @@ -777,7 +2430,7 @@ ------------------------------------------------------------------------ -r19613 | jb | 2007-04-01 14:11:21 +0200 (Sun, 01 Apr 2007) | 3 lines +r19613 | jb | 2007-04-01 13:11:21 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile @@ -785,7 +2438,7 @@ ------------------------------------------------------------------------ -r19612 | jb | 2007-04-01 14:09:19 +0200 (Sun, 01 Apr 2007) | 3 lines +r19612 | jb | 2007-04-01 13:09:19 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak @@ -793,7 +2446,7 @@ ------------------------------------------------------------------------ -r19610 | hartman | 2007-04-01 03:37:01 +0200 (Sun, 01 Apr 2007) | 4 lines +r19610 | hartman | 2007-04-01 02:37:01 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/dvbsub.c @@ -802,7 +2455,7 @@ fixes dvbsub positioning ------------------------------------------------------------------------ -r19609 | hartman | 2007-04-01 03:32:48 +0200 (Sun, 01 Apr 2007) | 4 lines +r19609 | hartman | 2007-04-01 02:32:48 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/include/vlc_es.h @@ -811,7 +2464,7 @@ Fixed es_format_Clean (when called multiple times with the same es_format). ------------------------------------------------------------------------ -r19608 | hartman | 2007-04-01 03:31:55 +0200 (Sun, 01 Apr 2007) | 4 lines +r19608 | hartman | 2007-04-01 02:31:55 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/flac.c @@ -820,7 +2473,7 @@ Fixed a memleak per packetizer module_Need in flac.c ------------------------------------------------------------------------ -r19607 | hartman | 2007-04-01 03:28:22 +0200 (Sun, 01 Apr 2007) | 4 lines +r19607 | hartman | 2007-04-01 02:28:22 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/rawvideo.c @@ -829,7 +2482,7 @@ Do not use visible_pitch when walking trough the lines ------------------------------------------------------------------------ -r19606 | hartman | 2007-04-01 03:24:53 +0200 (Sun, 01 Apr 2007) | 4 lines +r19606 | hartman | 2007-04-01 02:24:53 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/mkv.cpp @@ -838,7 +2491,7 @@ matroska crash. don't use block, in case when it can be ( block || simpleblock) ------------------------------------------------------------------------ -r19605 | hartman | 2007-04-01 03:23:18 +0200 (Sun, 01 Apr 2007) | 4 lines +r19605 | hartman | 2007-04-01 02:23:18 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/mp4/libmp4.c M /branches/0.8.6-bugfix/modules/stream_out/rtp.c @@ -848,7 +2501,7 @@ Fixed wrong type used in mp4 parsing ------------------------------------------------------------------------ -r19603 | hartman | 2007-04-01 03:19:51 +0200 (Sun, 01 Apr 2007) | 3 lines +r19603 | hartman | 2007-04-01 02:19:51 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/modules/packetizer/h264.c M /branches/0.8.6-bugfix/modules/stream_out/rtp.c @@ -857,7 +2510,7 @@ H264 packetization fixes ------------------------------------------------------------------------ -r19602 | hartman | 2007-04-01 03:10:23 +0200 (Sun, 01 Apr 2007) | 4 lines +r19602 | hartman | 2007-04-01 02:10:23 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/control/telnet.c @@ -866,7 +2519,7 @@ Patch by ILEoo to make the telnet interface work with "telnet" again (on linux). Looks ok according to the recv(2) manpage. Please fix if this is flawed. ------------------------------------------------------------------------ -r19601 | hartman | 2007-04-01 03:08:43 +0200 (Sun, 01 Apr 2007) | 4 lines +r19601 | hartman | 2007-04-01 02:08:43 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/faad.c @@ -875,7 +2528,7 @@ (Fixed lol-vlc.aac segfault, http://sam.zoy.org/zzuf/) ------------------------------------------------------------------------ -r19600 | hartman | 2007-04-01 03:06:18 +0200 (Sun, 01 Apr 2007) | 4 lines +r19600 | hartman | 2007-04-01 02:06:18 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/src/input/decoder.c @@ -884,7 +2537,7 @@ Copy complete es format descriptor when extra data is added. ------------------------------------------------------------------------ -r19599 | hartman | 2007-04-01 03:03:06 +0200 (Sun, 01 Apr 2007) | 4 lines +r19599 | hartman | 2007-04-01 02:03:06 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/packetizer/mpeg4audio.c @@ -893,7 +2546,7 @@ Fixed uninitialized value for ADTS stream. ------------------------------------------------------------------------ -r19598 | hartman | 2007-04-01 02:59:25 +0200 (Sun, 01 Apr 2007) | 5 lines +r19598 | hartman | 2007-04-01 01:59:25 +0100 (Sun, 01 Apr 2007) | 5 lines Changed paths: M /branches/0.8.6-bugfix/src/video_output/vout_subpictures.c @@ -903,7 +2556,7 @@ ------------------------------------------------------------------------ -r19596 | hartman | 2007-04-01 02:53:38 +0200 (Sun, 01 Apr 2007) | 4 lines +r19596 | hartman | 2007-04-01 01:53:38 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/access/dvb/linux_dvb.c @@ -912,7 +2565,7 @@ Fixed memory leak at each new PMT if we don't have CAM. ------------------------------------------------------------------------ -r19595 | hartman | 2007-04-01 02:52:46 +0200 (Sun, 01 Apr 2007) | 4 lines +r19595 | hartman | 2007-04-01 01:52:46 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/ts.c @@ -921,14 +2574,14 @@ don't malloc(0) ------------------------------------------------------------------------ -r19594 | hartman | 2007-04-01 02:48:20 +0200 (Sun, 01 Apr 2007) | 2 lines +r19594 | hartman | 2007-04-01 01:48:20 +0100 (Sun, 01 Apr 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/video_output/vout_intf.c * this is a "bugfix release" define because this was centralized in 0.9.0 ------------------------------------------------------------------------ -r19593 | hartman | 2007-04-01 02:37:00 +0200 (Sun, 01 Apr 2007) | 3 lines +r19593 | hartman | 2007-04-01 01:37:00 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/modules/access/udp.c @@ -936,7 +2589,7 @@ Fix use of uninitialized memory with raw UDP ------------------------------------------------------------------------ -r19592 | hartman | 2007-04-01 02:31:04 +0200 (Sun, 01 Apr 2007) | 4 lines +r19592 | hartman | 2007-04-01 01:31:04 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/THANKS M /branches/0.8.6-bugfix/modules/access_output/http.c @@ -947,7 +2600,7 @@ HTTP and UDP access outputs return byte count ------------------------------------------------------------------------ -r19591 | hartman | 2007-04-01 02:28:24 +0200 (Sun, 01 Apr 2007) | 4 lines +r19591 | hartman | 2007-04-01 01:28:24 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/stream_out/switcher.c @@ -956,7 +2609,7 @@ Fix out-of-bound read in switcher ------------------------------------------------------------------------ -r19590 | hartman | 2007-04-01 02:24:31 +0200 (Sun, 01 Apr 2007) | 5 lines +r19590 | hartman | 2007-04-01 01:24:31 +0100 (Sun, 01 Apr 2007) | 5 lines Changed paths: M /branches/0.8.6-bugfix/modules/control/telnet.c @@ -966,7 +2619,7 @@ ------------------------------------------------------------------------ -r19588 | hartman | 2007-04-01 02:17:01 +0200 (Sun, 01 Apr 2007) | 4 lines +r19588 | hartman | 2007-04-01 01:17:01 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/THANKS M /branches/0.8.6-bugfix/configure.ac @@ -976,7 +2629,7 @@ Configure patches in use by Gentoo on 0.8.6 tree already ------------------------------------------------------------------------ -r19586 | hartman | 2007-04-01 02:11:10 +0200 (Sun, 01 Apr 2007) | 4 lines +r19586 | hartman | 2007-04-01 01:11:10 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/ts.c @@ -985,7 +2638,7 @@ modules/demux/ts.c: Fixed erroneous warning messages (reported by Bill May). ------------------------------------------------------------------------ -r19585 | hartman | 2007-04-01 02:09:11 +0200 (Sun, 01 Apr 2007) | 3 lines +r19585 | hartman | 2007-04-01 01:09:11 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/src/video_output/vout_intf.c @@ -993,7 +2646,7 @@ Don't crash on messed up aspect ratios ------------------------------------------------------------------------ -r19584 | hartman | 2007-04-01 02:03:53 +0200 (Sun, 01 Apr 2007) | 4 lines +r19584 | hartman | 2007-04-01 01:03:53 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/src/video_output/vout_intf.c @@ -1002,7 +2655,7 @@ Use DIR_SEP instead of "/" ------------------------------------------------------------------------ -r19583 | jb | 2007-04-01 01:59:39 +0200 (Sun, 01 Apr 2007) | 3 lines +r19583 | jb | 2007-04-01 00:59:39 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile M /branches/0.8.6-bugfix/extras/contrib/src/Patches/gnutls-win32.patch @@ -1012,7 +2665,7 @@ ------------------------------------------------------------------------ -r19582 | hartman | 2007-04-01 01:56:53 +0200 (Sun, 01 Apr 2007) | 5 lines +r19582 | hartman | 2007-04-01 00:56:53 +0100 (Sun, 01 Apr 2007) | 5 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/opengl.c @@ -1022,7 +2675,7 @@ ------------------------------------------------------------------------ -r19581 | hartman | 2007-04-01 01:50:36 +0200 (Sun, 01 Apr 2007) | 4 lines +r19581 | hartman | 2007-04-01 00:50:36 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/src/video_output/vout_subpictures.c @@ -1031,7 +2684,7 @@ Don't allow negative offsets when blending subpictures ------------------------------------------------------------------------ -r19580 | jb | 2007-04-01 01:43:52 +0200 (Sun, 01 Apr 2007) | 3 lines +r19580 | jb | 2007-04-01 00:43:52 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak @@ -1039,7 +2692,7 @@ ------------------------------------------------------------------------ -r19579 | hartman | 2007-04-01 01:43:46 +0200 (Sun, 01 Apr 2007) | 4 lines +r19579 | hartman | 2007-04-01 00:43:46 +0100 (Sun, 01 Apr 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/Delete_Preferences.app/Contents/Info.plist M /branches/0.8.6-bugfix/extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt @@ -1051,7 +2704,7 @@ applied Westacular's patch with minor modifications, which solves some issues with this script in certain situations and lets the Finder do most of the work. Note that this script isn't 10.2-save anymore and triggers the Finder to launch in case that it is closed. ------------------------------------------------------------------------ -r19578 | hartman | 2007-04-01 01:38:35 +0200 (Sun, 01 Apr 2007) | 3 lines +r19578 | hartman | 2007-04-01 00:38:35 +0100 (Sun, 01 Apr 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/live555.cpp @@ -1059,7 +2712,7 @@ small isolated feature. Enables H264 playback in apple's special RTP style ------------------------------------------------------------------------ -r19577 | hartman | 2007-04-01 01:25:52 +0200 (Sun, 01 Apr 2007) | 5 lines +r19577 | hartman | 2007-04-01 00:25:52 +0100 (Sun, 01 Apr 2007) | 5 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/skins2/x11/x11_window.cpp @@ -1069,7 +2722,7 @@ Should fix fullscreen on amd64 ------------------------------------------------------------------------ -r19496 | jpsaman | 2007-03-27 14:39:54 +0200 (Tue, 27 Mar 2007) | 1 line +r19496 | jpsaman | 2007-03-27 13:39:54 +0100 (Tue, 27 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/activex/axvlc.tlb M /branches/0.8.6-bugfix/activex/axvlc_idl.c @@ -1077,7 +2730,7 @@ Revert to previous ActiveX JS api ------------------------------------------------------------------------ -r19495 | jpsaman | 2007-03-27 14:38:10 +0200 (Tue, 27 Mar 2007) | 1 line +r19495 | jpsaman | 2007-03-27 13:38:10 +0100 (Tue, 27 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/activex/axvlc.idl M /branches/0.8.6-bugfix/activex/vlccontrol2.cpp @@ -1089,14 +2742,14 @@ Revert the ABI breakage introduced in rev [19469] [19471] ------------------------------------------------------------------------ -r19493 | jpsaman | 2007-03-27 10:41:07 +0200 (Tue, 27 Mar 2007) | 1 line +r19493 | jpsaman | 2007-03-27 09:41:07 +0100 (Tue, 27 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/extras/getopt.c M /branches/0.8.6-bugfix/src/misc/configuration.c Backport of rev [19371] ------------------------------------------------------------------------ -r19481 | damienf | 2007-03-26 00:38:56 +0200 (Mon, 26 Mar 2007) | 2 lines +r19481 | damienf | 2007-03-25 23:38:56 +0100 (Sun, 25 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/mozilla/control/npolibvlc.cpp M /branches/0.8.6-bugfix/mozilla/control/npolibvlc.h @@ -1108,7 +2761,7 @@ - mozilla: nultiple bugfix backports from trunk ------------------------------------------------------------------------ -r19480 | damienf | 2007-03-26 00:38:10 +0200 (Mon, 26 Mar 2007) | 2 lines +r19480 | damienf | 2007-03-25 23:38:10 +0100 (Sun, 25 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/activex/main.cpp M /branches/0.8.6-bugfix/activex/plugin.cpp @@ -1122,7 +2775,7 @@ - activex: multiple bugfix backports from trunk ------------------------------------------------------------------------ -r19479 | damienf | 2007-03-26 00:35:20 +0200 (Mon, 26 Mar 2007) | 2 lines +r19479 | damienf | 2007-03-25 23:35:20 +0100 (Sun, 25 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/control/audio.c M /branches/0.8.6-bugfix/src/control/core.c @@ -1132,44 +2785,44 @@ - src/control: multiple bug fix backport from trunk ------------------------------------------------------------------------ -r19477 | jpsaman | 2007-03-26 00:09:33 +0200 (Mon, 26 Mar 2007) | 1 line +r19477 | jpsaman | 2007-03-25 23:09:33 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/configure.ac Detect firefox headerfiles and configuration. ------------------------------------------------------------------------ -r19475 | fkuehne | 2007-03-25 22:54:35 +0200 (Sun, 25 Mar 2007) | 1 line +r19475 | fkuehne | 2007-03-25 21:54:35 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/voutgl.m * revert previous commit for Intel-based Macs ------------------------------------------------------------------------ -r19474 | fkuehne | 2007-03-25 22:34:26 +0200 (Sun, 25 Mar 2007) | 1 line +r19474 | fkuehne | 2007-03-25 21:34:26 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/voutgl.m * revert OpenGL context locking, as this is 10.4-only ------------------------------------------------------------------------ -r19473 | fkuehne | 2007-03-25 21:56:49 +0200 (Sun, 25 Mar 2007) | 1 line +r19473 | fkuehne | 2007-03-25 20:56:49 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: D /branches/0.8.6-bugfix/src/misc/darwin_specific.c * that shouldn't be there ------------------------------------------------------------------------ -r19472 | fkuehne | 2007-03-25 21:49:02 +0200 (Sun, 25 Mar 2007) | 1 line +r19472 | fkuehne | 2007-03-25 20:49:02 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/Makefile.am A /branches/0.8.6-bugfix/src/misc/darwin_specific.m (from /branches/0.8.6-bugfix/src/misc/darwin_specific.c:19459) * revert Pierre's fixes for 0.8.6b, as they aren't 10.3.9 compatible without further configure/makefile changes ------------------------------------------------------------------------ -r19471 | jpsaman | 2007-03-25 21:36:27 +0200 (Sun, 25 Mar 2007) | 1 line +r19471 | jpsaman | 2007-03-25 20:36:27 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/include/vlc/libvlc.h Don't forget the API definitions. ------------------------------------------------------------------------ -r19469 | jpsaman | 2007-03-25 21:34:50 +0200 (Sun, 25 Mar 2007) | 2 lines +r19469 | jpsaman | 2007-03-25 20:34:50 +0100 (Sun, 25 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/activex/axvlc.idl M /branches/0.8.6-bugfix/activex/axvlc_idl.c @@ -1184,25 +2837,25 @@ Backport of rev [18432] [19304] [19383] with audio.track audio.channel and video.subtitle support. ------------------------------------------------------------------------ -r19464 | fkuehne | 2007-03-25 19:50:04 +0200 (Sun, 25 Mar 2007) | 1 line +r19464 | fkuehne | 2007-03-25 18:50:04 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile * fixed ffmpeg's configure options and set the approbiate svn revisions for x264 (604) and libmatroska/libebml (1254) ------------------------------------------------------------------------ -r19461 | fkuehne | 2007-03-25 18:55:02 +0200 (Sun, 25 Mar 2007) | 1 line +r19461 | fkuehne | 2007-03-25 17:55:02 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile hmm, 0.8.6a used 7407 instead of 7400... ------------------------------------------------------------------------ -r19460 | fkuehne | 2007-03-25 18:21:53 +0200 (Sun, 25 Mar 2007) | 1 line +r19460 | fkuehne | 2007-03-25 17:21:53 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile * limit ffmpeg to revision 7400 to match 0.8.6a and prevent potential compatiblity issue. needs a bit of further testing ------------------------------------------------------------------------ -r19459 | fkuehne | 2007-03-25 18:15:33 +0200 (Sun, 25 Mar 2007) | 1 line +r19459 | fkuehne | 2007-03-25 17:15:33 +0100 (Sun, 25 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS M /branches/0.8.6-bugfix/configure.ac @@ -1210,47 +2863,47 @@ * updated for the potential 0.8.6b ------------------------------------------------------------------------ -r19395 | massiot | 2007-03-23 00:13:24 +0100 (Fri, 23 Mar 2007) | 2 lines +r19395 | massiot | 2007-03-22 23:13:24 +0000 (Thu, 22 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/mux/mpeg/ts.c Backport [18833]. ------------------------------------------------------------------------ -r19386 | jpsaman | 2007-03-22 15:44:14 +0100 (Thu, 22 Mar 2007) | 1 line +r19386 | jpsaman | 2007-03-22 14:44:14 +0000 (Thu, 22 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/control/playlist.c Backport of rev [19385] ------------------------------------------------------------------------ -r19384 | jpsaman | 2007-03-22 14:50:34 +0100 (Thu, 22 Mar 2007) | 1 line +r19384 | jpsaman | 2007-03-22 13:50:34 +0000 (Thu, 22 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/control/input.c Backport of rev [19383] ------------------------------------------------------------------------ -r19347 | sam | 2007-03-17 22:21:26 +0100 (Sat, 17 Mar 2007) | 2 lines +r19347 | sam | 2007-03-17 21:21:26 +0000 (Sat, 17 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/video_output/x11/xcommon.c * modules/video_output/x11/xcommon.c: fix XShm detection on remote X. ------------------------------------------------------------------------ -r19337 | xtophe | 2007-03-14 22:54:16 +0100 (Wed, 14 Mar 2007) | 2 lines +r19337 | xtophe | 2007-03-14 21:54:16 +0000 (Wed, 14 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/extras/contrib/Makefile backport [19336]. make install dir configurable ------------------------------------------------------------------------ -r19306 | sam | 2007-03-12 16:31:42 +0100 (Mon, 12 Mar 2007) | 2 lines +r19306 | sam | 2007-03-12 15:31:42 +0000 (Mon, 12 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/audio_filter/format.c * modules/audio_filter/format.c: fix audio conversion crashes and bugs. ------------------------------------------------------------------------ -r19298 | courmisch | 2007-03-11 16:54:09 +0100 (Sun, 11 Mar 2007) | 2 lines +r19298 | courmisch | 2007-03-11 15:54:09 +0000 (Sun, 11 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/skins2/x11/x11_window.cpp M /branches/0.8.6-bugfix/modules/video_output/x11/xcommon.h @@ -1258,28 +2911,28 @@ Backport [19297]: Another attempt to fix X11 fullscreen on amd64 ------------------------------------------------------------------------ -r19257 | hartman | 2007-03-09 21:48:26 +0100 (Fri, 09 Mar 2007) | 2 lines +r19257 | hartman | 2007-03-09 20:48:26 +0000 (Fri, 09 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/voutgl.m * backport opengl context locking bugfix from [19427] ------------------------------------------------------------------------ -r19248 | md | 2007-03-08 15:41:12 +0100 (Thu, 08 Mar 2007) | 2 lines +r19248 | md | 2007-03-08 14:41:12 +0000 (Thu, 08 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/vlc.c backport [18818] ------------------------------------------------------------------------ -r19246 | hartman | 2007-03-08 02:10:24 +0100 (Thu, 08 Mar 2007) | 2 lines +r19246 | hartman | 2007-03-08 01:10:24 +0000 (Thu, 08 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile * Fix ffmpeg building on bugfix tree ------------------------------------------------------------------------ -r19224 | courmisch | 2007-03-06 21:17:40 +0100 (Tue, 06 Mar 2007) | 4 lines +r19224 | courmisch | 2007-03-06 20:17:40 +0000 (Tue, 06 Mar 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/src/misc/win32_specific.c M /branches/0.8.6-bugfix/src/vlc.c @@ -1289,27 +2942,27 @@ It's probably unrealistic to fix this completely within the 0.8.6 branch ------------------------------------------------------------------------ -r19215 | jpsaman | 2007-03-06 10:11:26 +0100 (Tue, 06 Mar 2007) | 2 lines +r19215 | jpsaman | 2007-03-06 09:11:26 +0000 (Tue, 06 Mar 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/control/core.c Backport rev [19192]. ------------------------------------------------------------------------ -r19180 | jpsaman | 2007-03-04 14:41:26 +0100 (Sun, 04 Mar 2007) | 1 line +r19180 | jpsaman | 2007-03-04 13:41:26 +0000 (Sun, 04 Mar 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/control/input.c Backport from rev [19109] ------------------------------------------------------------------------ -r19055 | courmisch | 2007-02-27 21:46:38 +0100 (Tue, 27 Feb 2007) | 2 lines +r19055 | courmisch | 2007-02-27 20:46:38 +0000 (Tue, 27 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/stream_out/rtp.c Typo ------------------------------------------------------------------------ -r19051 | courmisch | 2007-02-27 21:22:19 +0100 (Tue, 27 Feb 2007) | 3 lines +r19051 | courmisch | 2007-02-27 20:22:19 +0000 (Tue, 27 Feb 2007) | 3 lines Changed paths: M /branches/0.8.6-bugfix/src/stream_output/sap.c @@ -1317,20 +2970,20 @@ - Do not send TTL with IN IP6 ------------------------------------------------------------------------ -r19050 | courmisch | 2007-02-27 21:19:39 +0100 (Tue, 27 Feb 2007) | 2 lines +r19050 | courmisch | 2007-02-27 20:19:39 +0000 (Tue, 27 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/stream_out/rtp.c Backport [19049]: no TTL for IN IP6 ------------------------------------------------------------------------ -r18985 | fkuehne | 2007-02-24 19:19:31 +0100 (Sat, 24 Feb 2007) | 1 line +r18985 | fkuehne | 2007-02-24 18:19:31 +0000 (Sat, 24 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/vlc.pbproj/project.pbxproj * added flv to the list of supported file types ------------------------------------------------------------------------ -r18980 | fkuehne | 2007-02-23 21:18:37 +0100 (Fri, 23 Feb 2007) | 1 line +r18980 | fkuehne | 2007-02-23 20:18:37 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS M /branches/0.8.6-bugfix/po/POTFILES.in @@ -1378,7 +3031,7 @@ * updated po-files ------------------------------------------------------------------------ -r18978 | fkuehne | 2007-02-23 21:07:18 +0100 (Fri, 23 Feb 2007) | 1 line +r18978 | fkuehne | 2007-02-23 20:07:18 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib @@ -1386,7 +3039,7 @@ * fixed 2 minor, but nasty typos and converted wizard.nib back to its binary format ------------------------------------------------------------------------ -r18977 | fkuehne | 2007-02-23 20:50:01 +0100 (Fri, 23 Feb 2007) | 1 line +r18977 | fkuehne | 2007-02-23 19:50:01 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib @@ -1396,33 +3049,33 @@ * added 2 boxes to the wizard to allow access to sout-transcode-soverlay with the GUI. needs further testing, but can't break anything. Additionally, the wizard's nib got converted to the diff-able xml-like format. refs #1005 ------------------------------------------------------------------------ -r18976 | fkuehne | 2007-02-23 19:57:14 +0100 (Fri, 23 Feb 2007) | 1 line +r18976 | fkuehne | 2007-02-23 18:57:14 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS M /branches/0.8.6-bugfix/modules/gui/macosx/vout.m * back-port a fix, which allows sleeping or showing the screensaver when a video is paused [18565] and originally solved #963 ------------------------------------------------------------------------ -r18975 | fkuehne | 2007-02-23 19:50:55 +0100 (Fri, 23 Feb 2007) | 1 line +r18975 | fkuehne | 2007-02-23 18:50:55 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS M /branches/0.8.6-bugfix/extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt * back-port the improved delete-prefs script [18568], which solved #911 ------------------------------------------------------------------------ -r18973 | fkuehne | 2007-02-23 19:08:54 +0100 (Fri, 23 Feb 2007) | 1 line +r18973 | fkuehne | 2007-02-23 18:08:54 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/vlc.pbproj/project.pbxproj * added embeddedwindow.* to the xcode project ------------------------------------------------------------------------ -r18971 | fkuehne | 2007-02-23 18:17:38 +0100 (Fri, 23 Feb 2007) | 1 line +r18971 | fkuehne | 2007-02-23 17:17:38 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/intf.m * removed duplicated, buggy code without changing the user's GUI experience (fixes #744) ------------------------------------------------------------------------ -r18969 | fkuehne | 2007-02-23 17:29:41 +0100 (Fri, 23 Feb 2007) | 1 line +r18969 | fkuehne | 2007-02-23 16:29:41 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/Makefile.am A /branches/0.8.6-bugfix/src/misc/darwin_specific.c (from /branches/0.8.6-bugfix/src/misc/darwin_specific.m:18968) @@ -1430,25 +3083,25 @@ * rename the file accordingly to the changed C style (Obj-C to plain C) ------------------------------------------------------------------------ -r18968 | fkuehne | 2007-02-23 17:28:27 +0100 (Fri, 23 Feb 2007) | 1 line +r18968 | fkuehne | 2007-02-23 16:28:27 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/src/misc/darwin_specific.m * back-port Pierre d'Herbemont's locale detection code cleanup ------------------------------------------------------------------------ -r18963 | fkuehne | 2007-02-23 14:32:54 +0100 (Fri, 23 Feb 2007) | 1 line +r18963 | fkuehne | 2007-02-23 13:32:54 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/NEWS * update NEWS ------------------------------------------------------------------------ -r18962 | fkuehne | 2007-02-23 14:28:06 +0100 (Fri, 23 Feb 2007) | 1 line +r18962 | fkuehne | 2007-02-23 13:28:06 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/misc.m * back-port Pierre d'Herbemont's patch to prioritize Cocoa menu short-cuts against VLC's native hotkeys [18766] ------------------------------------------------------------------------ -r18961 | fkuehne | 2007-02-23 14:22:13 +0100 (Fri, 23 Feb 2007) | 1 line +r18961 | fkuehne | 2007-02-23 13:22:13 +0000 (Fri, 23 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib @@ -1461,74 +3114,74 @@ * back-port Pierre d'Herbemont's patch to animate vout-window resizing [18882]. the nib file was manually adapted by myself as the patch failed. I hope that I got everything. It works right now :) ------------------------------------------------------------------------ -r18917 | courmisch | 2007-02-20 20:10:18 +0100 (Tue, 20 Feb 2007) | 2 lines +r18917 | courmisch | 2007-02-20 19:10:18 +0000 (Tue, 20 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/stream_output/sap.c COmpile fix ------------------------------------------------------------------------ -r18916 | courmisch | 2007-02-20 20:02:32 +0100 (Tue, 20 Feb 2007) | 2 lines +r18916 | courmisch | 2007-02-20 19:02:32 +0000 (Tue, 20 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/stream_output/sap.c x-plgroup should really be a session-level attribute ------------------------------------------------------------------------ -r18898 | fkuehne | 2007-02-20 08:26:43 +0100 (Tue, 20 Feb 2007) | 1 line +r18898 | fkuehne | 2007-02-20 07:26:43 +0000 (Tue, 20 Feb 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/modules/gui/macosx/fspanel.m * don't double free an object! Thanks to nivix for pointing me to the right direction and keeping to bug me about this. Fixes #978 ------------------------------------------------------------------------ -r18787 | courmisch | 2007-02-11 11:39:09 +0100 (Sun, 11 Feb 2007) | 2 lines +r18787 | courmisch | 2007-02-11 10:39:09 +0000 (Sun, 11 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/stream_output/sap.c Woops. Misread the spec. ------------------------------------------------------------------------ -r18775 | courmisch | 2007-02-10 21:34:15 +0100 (Sat, 10 Feb 2007) | 2 lines +r18775 | courmisch | 2007-02-10 20:34:15 +0000 (Sat, 10 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/stream_out/gather.c Backport [18773]: double free in gather stream output ------------------------------------------------------------------------ -r18741 | courmisch | 2007-02-09 20:52:52 +0100 (Fri, 09 Feb 2007) | 2 lines +r18741 | courmisch | 2007-02-09 19:52:52 +0000 (Fri, 09 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/stream_output/sap.c SDP conformance fix ------------------------------------------------------------------------ -r18694 | xtophe | 2007-02-04 20:24:17 +0100 (Sun, 04 Feb 2007) | 2 lines +r18694 | xtophe | 2007-02-04 19:24:17 +0000 (Sun, 04 Feb 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/configure.ac Compile twolame plugin with -DLIBTWOLAME_STATIC on win32 ------------------------------------------------------------------------ -r18624 | fkuehne | 2007-01-21 20:23:38 +0100 (Sun, 21 Jan 2007) | 1 line +r18624 | fkuehne | 2007-01-21 19:23:38 +0000 (Sun, 21 Jan 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/MacOSX/vlc.pbproj/project.pbxproj * publish gvp support to launch-services (this was enabled in /trunk a long time ago, but forgotten to be back-ported to 0.8.6) ------------------------------------------------------------------------ -r18622 | fkuehne | 2007-01-21 20:15:43 +0100 (Sun, 21 Jan 2007) | 1 line +r18622 | fkuehne | 2007-01-21 19:15:43 +0000 (Sun, 21 Jan 2007) | 1 line Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/packages.mak * download the SDL stuff from sourceforge instead of the bogus official server, as the SF park is much faster and more reliable ------------------------------------------------------------------------ -r18621 | courmisch | 2007-01-21 10:48:28 +0100 (Sun, 21 Jan 2007) | 2 lines +r18621 | courmisch | 2007-01-21 09:48:28 +0000 (Sun, 21 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/NEWS Update News ------------------------------------------------------------------------ -r18619 | fkuehne | 2007-01-20 13:17:58 +0100 (Sat, 20 Jan 2007) | 4 lines +r18619 | fkuehne | 2007-01-20 12:17:58 +0000 (Sat, 20 Jan 2007) | 4 lines Changed paths: M /branches/0.8.6-bugfix/extras/contrib/src/Makefile A /branches/0.8.6-bugfix/extras/contrib/src/Patches/twolame-osx.patch @@ -1539,35 +3192,35 @@ - more recent library version (0.3.9 instead of 0.3.8) - [18618], [18552], [18530], [18525], [18524] (partially) ------------------------------------------------------------------------ -r18617 | courmisch | 2007-01-19 20:51:20 +0100 (Fri, 19 Jan 2007) | 2 lines +r18617 | courmisch | 2007-01-19 19:51:20 +0000 (Fri, 19 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/include/vlc_block.h Backport [18616] ------------------------------------------------------------------------ -r18614 | xtophe | 2007-01-19 17:57:37 +0100 (Fri, 19 Jan 2007) | 2 lines +r18614 | xtophe | 2007-01-19 16:57:37 +0000 (Fri, 19 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/po/it.po Update Italian l10n courtesy of Vincenzo Reale ------------------------------------------------------------------------ -r18611 | xtophe | 2007-01-18 15:15:22 +0100 (Thu, 18 Jan 2007) | 2 lines +r18611 | xtophe | 2007-01-18 14:15:22 +0000 (Thu, 18 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/NEWS Update NEWS to please make dist ------------------------------------------------------------------------ -r18599 | md | 2007-01-16 10:53:28 +0100 (Tue, 16 Jan 2007) | 2 lines +r18599 | md | 2007-01-16 09:53:28 +0000 (Tue, 16 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/misc/mtime.c Make branch compile ------------------------------------------------------------------------ -r18598 | xtophe | 2007-01-16 10:11:53 +0100 (Tue, 16 Jan 2007) | 2 lines +r18598 | xtophe | 2007-01-16 09:11:53 +0000 (Tue, 16 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/configure.ac M /branches/0.8.6-bugfix/extras/MacOSX/Resources/English.lproj/InfoPlist.strings @@ -1576,7 +3229,7 @@ Change version string ------------------------------------------------------------------------ -r18597 | md | 2007-01-16 09:17:34 +0100 (Tue, 16 Jan 2007) | 2 lines +r18597 | md | 2007-01-16 08:17:34 +0000 (Tue, 16 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/po/af.po M /branches/0.8.6-bugfix/po/ar.po @@ -1618,14 +3271,14 @@ Fix #969 for branch ------------------------------------------------------------------------ -r18591 | courmisch | 2007-01-14 21:45:12 +0100 (Sun, 14 Jan 2007) | 2 lines +r18591 | courmisch | 2007-01-14 20:45:12 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/ffmpeg/encoder.c Backport [18589] ------------------------------------------------------------------------ -r18588 | courmisch | 2007-01-14 21:33:16 +0100 (Sun, 14 Jan 2007) | 2 lines +r18588 | courmisch | 2007-01-14 20:33:16 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/asf/asf.c M /branches/0.8.6-bugfix/modules/demux/asf/libasf.c @@ -1634,28 +3287,28 @@ Backport [18573:18578] various leaks and crashes ------------------------------------------------------------------------ -r18587 | courmisch | 2007-01-14 21:30:57 +0100 (Sun, 14 Jan 2007) | 2 lines +r18587 | courmisch | 2007-01-14 20:30:57 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/asf/libasf.c Backport [18556] denial of service fix ------------------------------------------------------------------------ -r18586 | courmisch | 2007-01-14 21:30:15 +0100 (Sun, 14 Jan 2007) | 2 lines +r18586 | courmisch | 2007-01-14 20:30:15 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/gui/skins2/x11/x11_window.cpp Backport [18555] skins2 fullscreen fix ------------------------------------------------------------------------ -r18585 | courmisch | 2007-01-14 21:26:41 +0100 (Sun, 14 Jan 2007) | 2 lines +r18585 | courmisch | 2007-01-14 20:26:41 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/ffmpeg/encoder.c Backport previous stuff correctly ------------------------------------------------------------------------ -r18584 | courmisch | 2007-01-14 21:24:29 +0100 (Sun, 14 Jan 2007) | 5 lines +r18584 | courmisch | 2007-01-14 20:24:29 +0000 (Sun, 14 Jan 2007) | 5 lines Changed paths: M /branches/0.8.6-bugfix/modules/codec/ffmpeg/encoder.c @@ -1665,28 +3318,28 @@ Could be, but really looks unlikely to me) ------------------------------------------------------------------------ -r18583 | courmisch | 2007-01-14 21:17:28 +0100 (Sun, 14 Jan 2007) | 2 lines +r18583 | courmisch | 2007-01-14 20:17:28 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/src/misc/mtime.c Backport [18545] RTC fix ------------------------------------------------------------------------ -r18582 | courmisch | 2007-01-14 21:15:51 +0100 (Sun, 14 Jan 2007) | 2 lines +r18582 | courmisch | 2007-01-14 20:15:51 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/demux/avi/libavi.c Backport [15827] OpenML fix ------------------------------------------------------------------------ -r18581 | courmisch | 2007-01-14 21:05:24 +0100 (Sun, 14 Jan 2007) | 2 lines +r18581 | courmisch | 2007-01-14 20:05:24 +0000 (Sun, 14 Jan 2007) | 2 lines Changed paths: M /branches/0.8.6-bugfix/modules/access/directory.c Backport deadlock fix from [18502] ------------------------------------------------------------------------ -r18580 | courmisch | 2007-01-14 20:54:22 +0100 (Sun, 14 Jan 2007) | 4 lines +r18580 | courmisch | 2007-01-14 19:54:22 +0000 (Sun, 14 Jan 2007) | 4 lines Changed paths: A /branches/0.8.6-bugfix (from /tags/0.8.6b:18579) D /tags/0.8.6b @@ -1696,7 +3349,7 @@ you can still tag release individually ------------------------------------------------------------------------ -r18579 | courmisch | 2007-01-14 20:52:22 +0100 (Sun, 14 Jan 2007) | 4 lines +r18579 | courmisch | 2007-01-14 19:52:22 +0000 (Sun, 14 Jan 2007) | 4 lines Changed paths: A /tags/0.8.6b (from /tags/0.8.6a:18578) @@ -1705,32 +3358,32 @@ (but we still have 0.8.7a-0.8.9z too, which means 100+ possible releases) ------------------------------------------------------------------------ -r18494 | fkuehne | 2007-01-03 23:06:34 +0100 (Wed, 03 Jan 2007) | 1 line +r18494 | fkuehne | 2007-01-03 22:06:34 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: M /tags/0.8.6a/modules/gui/macosx/macosx.m * stupid =GWEOLn%%= -- patch and diff are sooo lovely tools ------------------------------------------------------------------------ -r18493 | fkuehne | 2007-01-03 19:36:31 +0100 (Wed, 03 Jan 2007) | 1 line +r18493 | fkuehne | 2007-01-03 18:36:31 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: M /tags/0.8.6a/modules/gui/macosx/macosx.m * fixed compilation issue introduced by improper auto-patching ------------------------------------------------------------------------ -r18492 | fkuehne | 2007-01-03 19:27:44 +0100 (Wed, 03 Jan 2007) | 1 line +r18492 | fkuehne | 2007-01-03 18:27:44 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: D /branches/0.8.6a A /tags/0.8.6a (from /branches/0.8.6a:18491) * tag 0.8.6a ------------------------------------------------------------------------ -r18491 | fkuehne | 2007-01-03 19:23:24 +0100 (Wed, 03 Jan 2007) | 1 line +r18491 | fkuehne | 2007-01-03 18:23:24 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: M /branches/0.8.6a/NEWS * update news ------------------------------------------------------------------------ -r18490 | fkuehne | 2007-01-03 19:18:24 +0100 (Wed, 03 Jan 2007) | 1 line +r18490 | fkuehne | 2007-01-03 18:18:24 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: M /branches/0.8.6a/configure.ac M /branches/0.8.6a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings @@ -1738,13 +3391,13 @@ * update the copyright dates ------------------------------------------------------------------------ -r18489 | fkuehne | 2007-01-03 19:16:42 +0100 (Wed, 03 Jan 2007) | 1 line +r18489 | fkuehne | 2007-01-03 18:16:42 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: M /branches/0.8.6a/mozilla/install.js * update the hard-coded version correctly ------------------------------------------------------------------------ -r18488 | jb | 2007-01-03 18:49:32 +0100 (Wed, 03 Jan 2007) | 3 lines +r18488 | jb | 2007-01-03 17:49:32 +0000 (Wed, 03 Jan 2007) | 3 lines Changed paths: M /branches/0.8.6a/modules/access/cdda/access.c M /branches/0.8.6a/modules/access/vcdx/access.c @@ -1753,7 +3406,7 @@ ------------------------------------------------------------------------ -r18487 | fkuehne | 2007-01-03 18:37:12 +0100 (Wed, 03 Jan 2007) | 1 line +r18487 | fkuehne | 2007-01-03 17:37:12 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: M /branches/0.8.6a/modules/gui/macosx/fspanel.h M /branches/0.8.6a/modules/gui/macosx/fspanel.m @@ -1762,7 +3415,7 @@ * port fullscreen controller fixes, thus [18458], [18417], [18409], [18384] ------------------------------------------------------------------------ -r18486 | fkuehne | 2007-01-03 18:25:40 +0100 (Wed, 03 Jan 2007) | 1 line +r18486 | fkuehne | 2007-01-03 17:25:40 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: M /branches/0.8.6a/configure.ac M /branches/0.8.6a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings @@ -1771,7 +3424,7 @@ * update version to 0.8.6a ------------------------------------------------------------------------ -r18485 | fkuehne | 2007-01-03 18:18:24 +0100 (Wed, 03 Jan 2007) | 1 line +r18485 | fkuehne | 2007-01-03 17:18:24 +0000 (Wed, 03 Jan 2007) | 1 line Changed paths: A /branches/0.8.6a (from /tags/0.8.6:18484) diff -Nur --exclude po vlc-0.8.6d/config.h.in vlc-0.8.6e/config.h.in --- vlc-0.8.6d/config.h.in 2007-11-28 06:22:59.000000000 +1100 +++ vlc-0.8.6e/config.h.in 2008-02-25 06:07:09.000000000 +1100 @@ -27,6 +27,9 @@ /* Copyright string */ #undef COPYRIGHT_MESSAGE +/* The copyright years */ +#undef COPYRIGHT_YEARS + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ diff -Nur --exclude po vlc-0.8.6d/configure vlc-0.8.6e/configure --- vlc-0.8.6d/configure 2007-11-28 06:22:58.000000000 +1100 +++ vlc-0.8.6e/configure 2008-02-25 06:07:09.000000000 +1100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for vlc 0.8.6d. +# Generated by GNU Autoconf 2.61 for vlc 0.8.6e. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ # Identity of this package. PACKAGE_NAME='vlc' PACKAGE_TARNAME='vlc' -PACKAGE_VERSION='0.8.6d' -PACKAGE_STRING='vlc 0.8.6d' +PACKAGE_VERSION='0.8.6e' +PACKAGE_STRING='vlc 0.8.6e' PACKAGE_BUGREPORT='' ac_unique_file="src/libvlc.c" @@ -879,6 +879,8 @@ SED LN_S ECHO +DSYMUTIL +NMEDIT DLLTOOL AS OBJDUMP @@ -1599,7 +1601,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vlc 0.8.6d to adapt to many kinds of systems. +\`configure' configures vlc 0.8.6e to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1674,7 +1676,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vlc 0.8.6d:";; + short | recursive ) echo "Configuration of vlc 0.8.6e:";; esac cat <<\_ACEOF @@ -2048,7 +2050,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vlc configure 0.8.6d +vlc configure 0.8.6e generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2062,7 +2064,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vlc $as_me 0.8.6d, which was +It was created by vlc $as_me 0.8.6e, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2418,10 +2420,11 @@ VERSION_MAJOR="0" VERSION_MINOR="8" VERSION_REVISION="6" -VERSION_EXTRA="d" +VERSION_EXTRA="e" CONFIGURE_LINE="$0 $*" CODENAME="Janus" +COPYRIGHT_YEARS="1996-2008" @@ -2869,7 +2872,7 @@ # Define the identity of the package. PACKAGE='vlc' - VERSION='0.8.6d' + VERSION='0.8.6e' cat >>confdefs.h <<_ACEOF @@ -6358,7 +6361,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in -aix4* | aix5*) +aix[4-9]*) lt_cv_deplibs_check_method=pass_all ;; @@ -6573,7 +6576,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6576 "configure"' > conftest.$ac_ext + echo '#line 6579 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6745,7 +6748,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) LD="${LD-ld} -64" ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; esac ;; esac @@ -7929,7 +7936,6 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } @@ -8244,7 +8250,7 @@ echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 fi - rm -f conftest* conftst* + rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then @@ -8804,6 +8810,318 @@ ;; esac + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +echo "${ECHO_T}$DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +echo "${ECHO_T}$NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + echo "int foo(void){return 1;}" > conftest.c + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib ${wl}-single_module conftest.c + if test -f libconftest.dylib; then + lt_cv_apple_cc_single_mod=yes + rm -rf libconftest.dylib* + fi + rm conftest.c + fi +fi +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_ld_exported_symbols_list=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" + fi + if test "$DSYMUTIL" != ":"; then + _lt_dsymutil="~$DSYMUTIL \$lib || :" + else + _lt_dsymutil= + fi + ;; + esac + + enable_dlopen=yes enable_win32_dll=yes @@ -8869,7 +9187,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* @@ -8897,11 +9215,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8900: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9218: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8904: \$? = $ac_status" >&5 + echo "$as_me:9222: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9171,10 +9489,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works=no + lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" @@ -9187,27 +9505,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9190: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9508: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9194: \$? = $ac_status" >&5 + echo "$as_me:9512: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works=yes + lt_cv_prog_compiler_pic_works=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_prog_compiler_pic_works" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -9234,10 +9552,10 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works+set}" = set; then +if test "${lt_cv_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works=no + lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -9250,20 +9568,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi else - lt_prog_compiler_static_works=yes + lt_cv_prog_compiler_static_works=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_prog_compiler_static_works" = xyes; then +if test x"$lt_cv_prog_compiler_static_works" = xyes; then : else lt_prog_compiler_static= @@ -9291,11 +9609,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9294: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9612: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9298: \$? = $ac_status" >&5 + echo "$as_me:9616: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9375,12 +9693,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -9439,7 +9758,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -9659,7 +9978,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -9679,7 +9998,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -9951,11 +10270,10 @@ link_all_deplibs=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -10475,7 +10793,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -11009,6 +11327,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -11328,7 +11661,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else { echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } @@ -11604,7 +11937,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -11653,7 +11986,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -12724,7 +13063,7 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -12737,7 +13076,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) @@ -12995,51 +13334,23 @@ fi ;; darwin* | rhapsody*) - case $host_os in - rhapsody* | darwin1.[012]) - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' - ;; - *) # Darwin 1.3 on - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - else - case ${MACOSX_DEPLOYMENT_TARGET} in - 10.[012]) - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' - ;; - 10.*) - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' - ;; - esac - fi - ;; - esac archive_cmds_need_lc_CXX=no hardcode_direct_CXX=no hardcode_automatic_CXX=yes hardcode_shlibpath_var_CXX=unsupported whole_archive_flag_spec_CXX='' link_all_deplibs_CXX=yes - - if test "$GXX" = yes ; then - lt_int_apple_cc_single_mod=no + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + if test "$GXX" = yes ; then output_verbose_link_cmd='echo' - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then - lt_int_apple_cc_single_mod=yes + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - fi - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' else case $cc_basename in xlc*) @@ -13290,7 +13601,7 @@ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; - pgCC*) + pgCC* | pgcpp*) # Portland Group C++ compiler archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' @@ -13697,7 +14008,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" - cat > conftest.$ac_ext <&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_CXX=no + lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" @@ -14173,27 +14487,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14176: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14490: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14180: \$? = $ac_status" >&5 + echo "$as_me:14494: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_CXX=yes + lt_cv_prog_compiler_pic_works_CXX=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; @@ -14220,10 +14534,10 @@ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_CXX=no + lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -14236,20 +14550,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi else - lt_prog_compiler_static_works_CXX=yes + lt_cv_prog_compiler_static_works_CXX=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : else lt_prog_compiler_static_CXX= @@ -14277,11 +14591,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14280: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14594: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14284: \$? = $ac_status" >&5 + echo "$as_me:14598: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14334,7 +14648,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in - aix4* | aix5*) + aix[4-9]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then @@ -14356,6 +14670,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 echo "${ECHO_T}$ld_shlibs_CXX" >&6; } @@ -14457,7 +14772,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -14990,6 +15305,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -15073,6 +15403,7 @@ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX \ + compiler_lib_search_dirs_CXX \ archive_cmds_CXX \ archive_expsym_cmds_CXX \ postinstall_cmds_CXX \ @@ -15321,6 +15652,10 @@ # shared library. postdeps=$lt_postdeps_CXX +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_CXX @@ -15535,7 +15870,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -15573,7 +15908,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; -aix4* | aix5*) +aix[4-9]*) if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi @@ -15838,10 +16173,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_F77=no + lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" @@ -15854,27 +16189,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15857: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16192: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15861: \$? = $ac_status" >&5 + echo "$as_me:16196: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_F77=yes + lt_cv_prog_compiler_pic_works_F77=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in "" | " "*) ;; *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; @@ -15901,10 +16236,10 @@ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_F77+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_F77=no + lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -15917,20 +16252,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi else - lt_prog_compiler_static_works_F77=yes + lt_cv_prog_compiler_static_works_F77=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -if test x"$lt_prog_compiler_static_works_F77" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : else lt_prog_compiler_static_F77= @@ -15958,11 +16293,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15961: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16296: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15965: \$? = $ac_status" >&5 + echo "$as_me:16300: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16042,12 +16377,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -16106,7 +16442,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_F77=no @@ -16326,7 +16662,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -16346,7 +16682,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -16598,11 +16934,10 @@ link_all_deplibs_F77=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -17071,7 +17406,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -17604,6 +17939,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -17687,6 +18037,7 @@ predeps_F77 \ postdeps_F77 \ compiler_lib_search_path_F77 \ + compiler_lib_search_dirs_F77 \ archive_cmds_F77 \ archive_expsym_cmds_F77 \ postinstall_cmds_F77 \ @@ -17935,6 +18286,10 @@ # shared library. postdeps=$lt_postdeps_F77 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_F77 @@ -18109,7 +18464,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -18158,11 +18513,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18161: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18516: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18165: \$? = $ac_status" >&5 + echo "$as_me:18520: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18222,7 +18577,7 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; darwin* | rhapsody*) @@ -18292,7 +18647,7 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; hpux9* | hpux10* | hpux11*) @@ -18432,10 +18787,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_pic_works_GCJ=no + lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" @@ -18448,27 +18803,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18451: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18806: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18455: \$? = $ac_status" >&5 + echo "$as_me:18810: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_GCJ=yes + lt_cv_prog_compiler_pic_works_GCJ=yes fi fi $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in "" | " "*) ;; *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; @@ -18495,10 +18850,10 @@ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - lt_prog_compiler_static_works_GCJ=no + lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -18511,20 +18866,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi else - lt_prog_compiler_static_works_GCJ=yes + lt_cv_prog_compiler_static_works_GCJ=yes fi fi - $rm conftest* + $rm -r conftest* LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : else lt_prog_compiler_static_GCJ= @@ -18552,11 +18907,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18555: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18910: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18559: \$? = $ac_status" >&5 + echo "$as_me:18914: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18636,12 +18991,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if # the symbol is explicitly referenced. Since portable code cannot # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do @@ -18700,7 +19056,7 @@ # See if GNU ld supports shared libraries. case $host_os in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_GCJ=no @@ -18920,7 +19276,7 @@ fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -18940,7 +19296,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -19212,11 +19568,10 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" else case $cc_basename in xlc*) @@ -19685,7 +20040,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; -aix4* | aix5*) +aix[4-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -20218,6 +20573,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" @@ -20301,6 +20671,7 @@ predeps_GCJ \ postdeps_GCJ \ compiler_lib_search_path_GCJ \ + compiler_lib_search_dirs_GCJ \ archive_cmds_GCJ \ archive_expsym_cmds_GCJ \ postinstall_cmds_GCJ \ @@ -20549,6 +20920,10 @@ # shared library. postdeps=$lt_postdeps_GCJ +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ @@ -20722,7 +21097,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$rm conftest* +$rm -r conftest* # Allow CC to be a program name with arguments. @@ -20782,6 +21157,7 @@ predeps_RC \ postdeps_RC \ compiler_lib_search_path_RC \ + compiler_lib_search_dirs_RC \ archive_cmds_RC \ archive_expsym_cmds_RC \ postinstall_cmds_RC \ @@ -21030,6 +21406,10 @@ # shared library. postdeps=$lt_postdeps_RC +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_RC @@ -51325,7 +51705,7 @@ cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBPNG +#define HAVE_LIBPNG 1 _ACEOF fi @@ -53299,7 +53679,7 @@ for element in opengl; do - eval "LDFLAGS_${element}="'"'"-framework OpenGL "'$'"{LDFLAGS_${element}} "'"' + eval "LDFLAGS_${element}="'"'"-framework OpenGL -framework Carbon "'$'"{LDFLAGS_${element}} "'"' am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" done @@ -64224,7 +64604,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 64227 "configure" */ +/* #line 64607 "configure" */ public class Test { } EOF @@ -64400,7 +64780,7 @@ if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 64403: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 64783: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -64522,7 +64902,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 64525 "configure" */ +/* #line 64905 "configure" */ public class Test { } EOF @@ -64559,7 +64939,7 @@ CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 64562 "configure" */ +/* [#]line 64942 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -64953,7 +65333,12 @@ cat >>confdefs.h <<_ACEOF -#define COPYRIGHT_MESSAGE "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2007 the VideoLAN team" +#define COPYRIGHT_MESSAGE "VLC media player - version ${VERSION} ${CODENAME} - (c) ${COPYRIGHT_YEARS} the VideoLAN team" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define COPYRIGHT_YEARS "${COPYRIGHT_YEARS}" _ACEOF @@ -64989,11 +65374,20 @@ #define VLC_COMPILE_BY "`whoami`" _ACEOF +if test "${build_os}" = "cygwin" +then cat >>confdefs.h <<_ACEOF #define VLC_COMPILE_HOST "`hostname`" _ACEOF +else + +cat >>confdefs.h <<_ACEOF +#define VLC_COMPILE_HOST "`hostname -s`" +_ACEOF + +fi cat >>confdefs.h <<_ACEOF #define VLC_COMPILE_DOMAIN "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`" @@ -65961,7 +66355,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vlc $as_me 0.8.6d, which was +This file was extended by vlc $as_me 0.8.6e, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -66014,7 +66408,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -vlc config.status 0.8.6d +vlc config.status 0.8.6e configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -66434,6 +66828,8 @@ SED!$SED$ac_delim LN_S!$LN_S$ac_delim ECHO!$ECHO$ac_delim +DSYMUTIL!$DSYMUTIL$ac_delim +NMEDIT!$NMEDIT$ac_delim DLLTOOL!$DLLTOOL$ac_delim AS!$AS$ac_delim OBJDUMP!$OBJDUMP$ac_delim @@ -66514,8 +66910,6 @@ SDL12_CONFIG!$SDL12_CONFIG$ac_delim SDL11_CONFIG!$SDL11_CONFIG$ac_delim SDL_CONFIG!$SDL_CONFIG$ac_delim -FREETYPE_CONFIG!$FREETYPE_CONFIG$ac_delim -FRIBIDI_CONFIG!$FRIBIDI_CONFIG$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -66557,6 +66951,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +FREETYPE_CONFIG!$FREETYPE_CONFIG$ac_delim +FRIBIDI_CONFIG!$FRIBIDI_CONFIG$ac_delim XML2_CONFIG!$XML2_CONFIG$ac_delim SVG_CFLAGS!$SVG_CFLAGS$ac_delim SVG_LIBS!$SVG_LIBS$ac_delim @@ -66633,7 +67029,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -Nur --exclude po vlc-0.8.6d/configure.ac vlc-0.8.6e/configure.ac --- vlc-0.8.6d/configure.ac 2007-11-28 00:11:35.000000000 +1100 +++ vlc-0.8.6e/configure.ac 2008-02-25 06:01:55.000000000 +1100 @@ -1,13 +1,14 @@ dnl Autoconf settings for vlc -AC_INIT(vlc,0.8.6d) +AC_INIT(vlc,0.8.6e) VERSION_MAJOR="0" VERSION_MINOR="8" VERSION_REVISION="6" -VERSION_EXTRA="d" +VERSION_EXTRA="e" CONFIGURE_LINE="$0 $*" CODENAME="Janus" +COPYRIGHT_YEARS="1996-2008" AC_PREREQ(2.50) AC_CONFIG_SRCDIR(src/libvlc.c) @@ -3360,7 +3361,7 @@ VLC_ADD_LDFLAGS([png],[-lpng -lz]) VLC_ADD_PLUGINS([png]) VLC_ADD_PLUGINS([osdmenu]) - AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])], + AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])], [],[-lz]) LDFLAGS="${LDFLAGS_save}" ]) @@ -3615,7 +3616,7 @@ else dnl OS X special case (no GL/gl.h but OpenGL/gl.h) VLC_ADD_PLUGINS([opengl]) - VLC_ADD_LDFLAGS([opengl],[-framework OpenGL]) + VLC_ADD_LDFLAGS([opengl],[-framework OpenGL -framework Carbon]) fi fi @@ -5456,7 +5457,8 @@ dnl Stuff used by the program dnl AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string]) -AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2007 the VideoLAN team", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) ${COPYRIGHT_YEARS} the VideoLAN team", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number]) @@ -5466,7 +5468,12 @@ AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_REVISION) AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) -AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) +if test "${build_os}" = "cygwin" +then + AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) +else + AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure]) +fi AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) diff -Nur --exclude po vlc-0.8.6d/doc/Makefile.in vlc-0.8.6e/doc/Makefile.in --- vlc-0.8.6d/doc/Makefile.in 2007-11-28 06:23:01.000000000 +1100 +++ vlc-0.8.6e/doc/Makefile.in 2008-02-25 06:07:11.000000000 +1100 @@ -128,6 +128,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -222,6 +223,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/evc/config.h vlc-0.8.6e/evc/config.h --- vlc-0.8.6d/evc/config.h 2007-11-28 09:16:41.000000000 +1100 +++ vlc-0.8.6e/evc/config.h 2008-02-28 05:41:36.000000000 +1100 @@ -4,7 +4,7 @@ #define CONFIGURE_LINE "eMbedded Visual C++" /* Copyright string */ -#define COPYRIGHT_MESSAGE "VLC media player - version 0.8.6d Janus - (c) 1996-2004 VideoLAN" +#define COPYRIGHT_MESSAGE "VLC media player - version 0.8.6e Janus - (c) 1996-2004 VideoLAN" /* Maximum supported data alignment */ #define ATTRIBUTE_ALIGNED_MAX 16 @@ -61,10 +61,10 @@ #define LIBEXT ".dll" /* String suffix for module functions */ -#define MODULE_SUFFIX "__0_8_6d" +#define MODULE_SUFFIX "__0_8_6e" /* Symbol suffix for module functions */ -#define MODULE_SYMBOL 0_8_6d +#define MODULE_SYMBOL 0_8_6e /* Name of package */ #define PACKAGE "vlc" @@ -76,22 +76,22 @@ #define PACKAGE_NAME "vlc" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "vlc 0.8.6d" +#define PACKAGE_STRING "vlc 0.8.6e" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "vlc" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.6d" +#define PACKAGE_VERSION "0.8.6e" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.8.6d" +#define VERSION "0.8.6e" /* Simple version string */ -#define VERSION_MESSAGE "0.8.6d Janus" +#define VERSION_MESSAGE "0.8.6e Janus" /* compiler */ #define VLC_COMPILER "Microsoft eMbedded Visual C++" diff -Nur --exclude po vlc-0.8.6d/extras/contrib/bootstrap vlc-0.8.6e/extras/contrib/bootstrap --- vlc-0.8.6d/extras/contrib/bootstrap 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/bootstrap 2008-02-28 05:41:54.000000000 +1100 @@ -3,7 +3,7 @@ # bootstrap : Set up config.mak # *************************************************************************** # Copyright (C) 2003-2006 the VideoLAN team -# $Id: bootstrap 23328 2007-11-25 20:54:07Z fkuehne $ +# $Id: bootstrap 25230 2008-02-21 10:05:28Z funman $ # # Authors: Christophe Massiot # @@ -41,7 +41,10 @@ fi rm -f config.mak -echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" > config.mak +{ + echo "# Automatically generated by bootstrap." + echo "# Make changes if you know what you're doing." +} > config.mak if test "$HOST" != "$BUILD"; then CC="${HOST}-gcc" @@ -63,11 +66,11 @@ # Makefile cross compiling is only supported with gcc-4.0 # ENVP defines the oldest environment on which the program will be able to run # SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK) - SDK_TARGET=10.4 + SDK_TARGET=10.3 echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak echo "HAVE_DARWIN_OS = 1" >> config.mak echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak - echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak + echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak CFLAGS_TUNING=" -mtune=G4" EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}" EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Makefile vlc-0.8.6e/extras/contrib/src/Makefile --- vlc-0.8.6d/extras/contrib/src/Makefile 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/Makefile 2008-02-28 05:41:54.000000000 +1100 @@ -1,8 +1,8 @@ #*************************************************************************** # src/Makefile : Dearchive and compile all files necessary # *************************************************************************** -# Copyright (C) 2003 - 2007 the VideoLAN team -# $Id: Makefile 23327 2007-11-25 16:54:29Z fkuehne $ +# Copyright (C) 2003 - 2008 the VideoLAN team +# $Id: Makefile 25234 2008-02-21 10:28:05Z funman $ # # Authors: Christophe Massiot # Derk-Jan Hartman @@ -37,10 +37,6 @@ export PATH := $(PREFIX)/bin:$(EXTRA_PATH):$(PATH) export PKG_CONFIG_PATH export PKG_CONFIG_LIBDIR = $(PREFIX)/lib/pkgconfig -export DYLD_LIBRARY_PATH = $(PREFIX)/lib -# following is required for configure scripts that check dyld libraries -# by building and running a test app -export DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):$(PREFIX)/vlc-lib export MACOSX_DEPLOYMENT_TARGET = $(SDK_TARGET) export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH) export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS) @@ -745,9 +741,6 @@ ifdef HAVE_DARWIN_OS (patch -p 0 < Patches/flac-mactel.patch) endif -ifneq ($(HOST),$(BUILD)) - (patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf) -endif .FLAC: flac ifdef HAVE_WIN32 @@ -1075,20 +1068,7 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz $(EXTRACT_GZ) - patch -p 0 < Patches/live.patch -ifdef HAVE_WIN32 - patch -p0 < Patches/livedotcom-win32.patch -endif -ifdef HAVE_DARWIN_OS - patch -p0 < Patches/live-osx.patch -endif - (cd live/liveMedia/include; \ - mv liveMedia_version.hh liveMedia_version.hh.bak; \ - sed -e 's/.*LIVEMEDIA_LIBRARY_VERSION_INT.*/#define LIVEMEDIA_LIBRARY_VERSION_INT 9999999999/' liveMedia_version.hh.bak > liveMedia_version.hh ) - patch -Np0 < Patches/live-config.patch -ifdef HAVE_UCLIBC patch -p0 < Patches/live-noapps.patch -endif .live: live ifdef HAVE_WIN32 @@ -1099,9 +1079,15 @@ (cd $<; ./genMakefiles macosx && make) else (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head) +ifdef HAVE_UCLIBC +ifdef HAVE_BIGENDIAN + (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC)) +endif +else (cd $<; ./genMakefiles linux && make $(HOSTCC)) endif endif +endif touch $@ CLEAN_FILE += .live @@ -1201,7 +1187,7 @@ ifdef SVN x264: - $(SVN) co svn://svn.videolan.org/x264/trunk/ -r 701 x264 + $(SVN) co svn://svn.videolan.org/x264/trunk/ -r 736 x264 ifdef HAVE_WIN32 (cd $@; patch -p 0 < ../Patches/x264-svn-win32.patch ) endif @@ -1339,7 +1325,7 @@ # (cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch) .wxwidgets: wxwidgets - (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib --without-libpng --without-libjpeg --without-libtiff --without-regex --disable-zipstream --disable-fs_zip --enable-no_rtti --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install) + (cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib --without-libpng --without-libjpeg --without-libtiff --without-regex --disable-zipstream --disable-fs_zip --enable-no_rtti --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers --enable-unicode && make && make install) $(INSTALL_NAME) touch $@ @@ -1406,7 +1392,7 @@ endif .xml: xml - (cd xml; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install) + (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-writer --with-output --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install) ifndef HAVE_DARWIN_OS $(INSTALL_NAME) endif @@ -1830,6 +1816,7 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz $(EXTRACT_GZ) patch -p 0 < Patches/SDL_image.patch + patch -p0 < Patches/SDL_image-CVE-2006-4484.patch .SDL_image: SDL_image .SDL .png .jpeg .tiff (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-tif --disable-sdltest CFLAGS="$(CFLAGS)" && make && make install) diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/packages.mak vlc-0.8.6e/extras/contrib/src/packages.mak --- vlc-0.8.6d/extras/contrib/src/packages.mak 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/packages.mak 2008-02-28 05:41:54.000000000 +1100 @@ -2,7 +2,7 @@ # src/packages.mak : Archive locations # *************************************************************************** # Copyright (C) 2003 - 2007 the VideoLAN team -# $Id: packages.mak 23180 2007-11-20 03:27:16Z jb $ +# $Id: packages.mak 24880 2008-02-05 04:14:56Z jb $ # # Authors: Christophe Massiot # Derk-Jan Hartman @@ -121,13 +121,14 @@ PNG_VERSION=1.2.12 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2 GPGERROR_VERSION=1.3 -GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz -#GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz +#GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz +GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz GCRYPT_VERSION=1.2.3 -GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 -#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2 +#GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2 +GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2 GNUTLS_VERSION=1.6.1 -GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2 +#GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2 +GNUTLS_URL=$(VIDEOLAN)/testing/contrib/gnutls-$(GNUTLS_VERSION).tar.bz2 DAAP_VERSION=0.4.0 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2 GLIB_VERSION=1.2.10 @@ -155,11 +156,11 @@ MUSE_VERSION=1.2.2 #MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2 MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2 -WXWIDGETS_VERSION=2.6.3 +WXWIDGETS_VERSION=2.6.4 WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz ZLIB_VERSION=1.2.3 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz -XML_VERSION=2.6.26 +XML_VERSION=2.6.31 XML_URL=ftp://xmlsoft.org/libxml2/libxml2-$(XML_VERSION).tar.gz DIRAC_VERSION=0.5.4 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Patches/live-config.patch vlc-0.8.6e/extras/contrib/src/Patches/live-config.patch --- vlc-0.8.6d/extras/contrib/src/Patches/live-config.patch 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/Patches/live-config.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,112 +0,0 @@ -diff -x Makefile -uN live/config.cygwin live.new/config.cygwin ---- live/config.cygwin 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.cygwin 2007-02-22 09:32:20.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = gcc - C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__CYGWIN__ -diff -x Makefile -uN live/config.freebsd live.new/config.freebsd ---- live/config.freebsd 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.freebsd 2007-02-22 09:32:06.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -+COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = cc - C_FLAGS = $(COMPILE_OPTS) -diff -x Makefile -uN live/config.linux live.new/config.linux ---- live/config.linux 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.linux 2007-02-22 09:31:24.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -+COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = cc - C_FLAGS = $(COMPILE_OPTS) -diff -x Makefile -uN live/config.linux-gdb live.new/config.linux-gdb ---- live/config.linux-gdb 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.linux-gdb 2007-02-22 09:09:55.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=socklen_t -g -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = cc - C_FLAGS = $(COMPILE_OPTS) -diff -x Makefile -uN live/config.macosx-before-version-10.4 live.new/config.macosx-before-version-10.4 ---- live/config.macosx-before-version-10.4 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.macosx-before-version-10.4 2007-02-22 09:10:30.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=int -+COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=int -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = cc - C_FLAGS = $(COMPILE_OPTS) -diff -x Makefile -uN live/config.mingw live.new/config.mingw ---- live/config.mingw 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.mingw 2007-02-22 09:10:48.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int -+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = gcc - C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -diff -x Makefile -uN live/config.openbsd live.new/config.openbsd ---- live/config.openbsd 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.openbsd 2007-02-22 09:31:42.000000000 +0100 -@@ -1,5 +1,5 @@ - .SUFFIXES: .cpp --COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -+COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = cc - C_FLAGS = $(COMPILE_OPTS) -diff -x Makefile -uN live/config.solaris live.new/config.solaris ---- live/config.solaris 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.solaris 2007-02-22 09:34:49.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t -+COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = cc - C_FLAGS = $(COMPILE_OPTS) -diff -x Makefile -uN live/config.uClinux live.new/config.uClinux ---- live/config.uClinux 2007-02-20 12:33:45.000000000 +0100 -+++ live.new/config.uClinux 2007-02-22 09:35:01.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -+COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = $(CC) - CFLAGS += $(COMPILE_OPTS) ---- live/config.armlinux 2007-04-24 11:38:22.000000000 +0200 -+++ live.new/config.armlinux 2007-04-28 15:59:33.000000000 +0200 -@@ -1,5 +1,5 @@ - CROSS_COMPILE= arm-elf- --COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -+COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1 - C = c - C_COMPILER = $(CROSS_COMPILE)gcc - C_FLAGS = $(COMPILE_OPTS) ---- /dev/null 2007-05-14 09:00:32.045340388 +0200 -+++ live/config.armeb-uclibc 2007-05-14 16:55:22.000000000 +0200 -@@ -0,0 +1,18 @@ -+CROSS_COMPILE= armeb-linux-uclibc- -+COMPILE_OPTS = $(INCLUDES) -I. -Os -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1 -+C = c -+C_COMPILER = $(CROSS_COMPILE)gcc -+C_FLAGS = $(COMPILE_OPTS) -+CPP = cpp -+CPLUSPLUS_COMPILER = $(CROSS_COMPILE)g++ -+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 -+OBJ = o -+LINK = $(CROSS_COMPILE)gcc -o -+LINK_OPTS = -L. -+CONSOLE_LINK_OPTS = $(LINK_OPTS) -+LIBRARY_LINK = $(CROSS_COMPILE)ld -o -+LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic -+LIB_SUFFIX = a -+LIBS_FOR_CONSOLE_APPLICATION = -+LIBS_FOR_GUI_APPLICATION = -+EXE = diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Patches/livedotcom-win32.patch vlc-0.8.6e/extras/contrib/src/Patches/livedotcom-win32.patch --- vlc-0.8.6d/extras/contrib/src/Patches/livedotcom-win32.patch 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/Patches/livedotcom-win32.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,25 +0,0 @@ -diff -ru live.orig/config.mingw live/config.mingw ---- live.orig/config.mingw 2005-10-23 08:50:31.000000000 +0200 -+++ live/config.mingw 2005-10-23 17:09:35.000000000 +0200 -@@ -1,15 +1,15 @@ - COMPILE_OPTS = $(INCLUDES) -I. -O -DSOCKLEN_T=int - C = c --C_COMPILER = gcc --C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -+C_COMPILER = $(CC) -+C_FLAGS = $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE - CPP = cpp --CPLUSPLUS_COMPILER = c++ --CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated -+CPLUSPLUS_COMPILER = $(CXX) -+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated - OBJ = o --LINK = c++ -o -+LINK = $(CXX) -o - LINK_OPTS = -L. - CONSOLE_LINK_OPTS = $(LINK_OPTS) --LIBRARY_LINK = ld -o -+LIBRARY_LINK = $(LD) -o - LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic - LIB_SUFFIX = a - LIBS_FOR_CONSOLE_APPLICATION = -lws2_32 diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Patches/live-osx.patch vlc-0.8.6e/extras/contrib/src/Patches/live-osx.patch --- vlc-0.8.6d/extras/contrib/src/Patches/live-osx.patch 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/Patches/live-osx.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,24 +0,0 @@ -diff -ruN live/Makefile.tail live.new/Makefile.tail ---- live/Makefile.tail 2007-01-17 21:44:27.000000000 +0100 -+++ live.new/Makefile.tail 2007-02-20 08:45:20.000000000 +0100 -@@ -17,10 +17,8 @@ - - ALL = $(LIVEMEDIA_LIB) \ - $(GROUPSOCK_LIB) \ - $(USAGE_ENVIRONMENT_LIB) \ -- $(BASIC_USAGE_ENVIRONMENT_LIB) \ -- $(TESTPROGS_APP) \ -- $(MEDIA_SERVER_APP) -+ $(BASIC_USAGE_ENVIRONMENT_LIB) - all: $(ALL) - - -diff -ruN live/config.macosx live.new/config.macosx ---- live/config.macosx 2007-01-17 21:44:26.000000000 +0100 -+++ live.new/config.macosx 2007-02-20 08:43:45.000000000 +0100 -@@ -1,4 +1,4 @@ --COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -+COMPILE_OPTS = $(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 - C = c - C_COMPILER = cc - C_FLAGS = $(COMPILE_OPTS) diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Patches/live.patch vlc-0.8.6e/extras/contrib/src/Patches/live.patch --- vlc-0.8.6d/extras/contrib/src/Patches/live.patch 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/Patches/live.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,116 +0,0 @@ -diff -ru live/groupsock/Groupsock.cpp live-patched/groupsock/Groupsock.cpp ---- live/groupsock/Groupsock.cpp Thu Nov 6 03:53:15 2003 -+++ live-patched/groupsock/Groupsock.cpp Sun Dec 7 21:30:15 2003 -@@ -26,7 +26,7 @@ - #if defined(__WIN32__) || defined(_WIN32) - #include - #else --#include -+#include - #endif - #include - -diff -ru live/groupsock/NetInterface.cpp live-patched/groupsock/NetInterface.cpp ---- live/groupsock/NetInterface.cpp Thu Nov 6 03:53:15 2003 -+++ live-patched/groupsock/NetInterface.cpp Sun Dec 7 21:30:30 2003 -@@ -24,7 +24,7 @@ - #if defined(__WIN32__) || defined(_WIN32) - #include - #else --#include -+#include - #endif - - ////////// NetInterface ////////// ---- live/liveMedia/RTSPClient.cpp 2007-04-24 11:38:22.000000000 +0200 -+++ live-patched/liveMedia/RTSPClient.cpp 2007-04-26 15:19:54.000000000 +0200 -@@ -21,13 +21,53 @@ - #include "RTSPClient.hh" - #include "RTSPCommon.hh" - #include "Base64.hh" --#include "Locale.hh" - #include - #include "our_md5.h" - #ifdef SUPPORT_REAL_RTSP - #include "../RealRTSP/include/RealRTSP.hh" - #endif - -+#include -+#include -+/* Radix safe (always uses .) printf and friends */ -+int radix_safe_sprintf( char *str, const char *format, ...) -+{ -+ va_list args; -+ int result = 0; -+ char *locale = NULL; -+ -+ locale = strDup( setlocale( LC_NUMERIC, NULL ) ); -+ setlocale( LC_NUMERIC, "C" ); -+ -+ va_start( args, format ); -+ result = vsprintf(str, format, args ); -+ va_end( args ); -+ -+ setlocale( LC_NUMERIC, locale ); -+ delete[] locale; -+ -+ return result; -+} -+ -+int radix_safe_sscanf( const char *str, const char *format, ...) -+{ -+ va_list args; -+ int result = 0; -+ char *locale = NULL; -+ -+ locale = strDup( setlocale( LC_NUMERIC, NULL ) ); -+ setlocale( LC_NUMERIC, "C" ); -+ -+ va_start( args, format ); -+ result = vsscanf(str, format, args ); -+ va_end( args ); -+ -+ setlocale( LC_NUMERIC, locale ); -+ delete[] locale; -+ -+ return result; -+} -+ - ////////// RTSPClient ////////// - - RTSPClient* RTSPClient::createNew(UsageEnvironment& env, -@@ -989,8 +1029,7 @@ - // This is the default value; we don't need a "Scale:" header: - buf[0] = '\0'; - } else { -- Locale("POSIX", LC_NUMERIC); -- sprintf(buf, "Scale: %f\r\n", scale); -+ radix_safe_sprintf(buf, "Scale: %f\r\n", scale); - } - - return strDup(buf); -@@ -1003,12 +1042,10 @@ - buf[0] = '\0'; - } else if (end < 0) { - // There's no end time: -- Locale("POSIX", LC_NUMERIC); -- sprintf(buf, "Range: npt=%.3f-\r\n", start); -+ radix_safe_sprintf(buf, "Range: npt=%.3f-\r\n", start); - } else { - // There's both a start and an end time; include them both in the "Range:" hdr -- Locale("POSIX", LC_NUMERIC); -- sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end); -+ radix_safe_sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end); - } - - return strDup(buf); -@@ -2246,8 +2283,7 @@ - if (_strncasecmp(line, "Scale: ", 7) != 0) return False; - line += 7; - -- Locale("POSIX", LC_NUMERIC); -- return sscanf(line, "%f", &scale) == 1; -+ return radix_safe_sscanf(line, "%f", &scale) == 1; - } - - Boolean RTSPClient::parseGetParameterHeader(char const* line, diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Patches/SDL_image-CVE-2006-4484.patch vlc-0.8.6e/extras/contrib/src/Patches/SDL_image-CVE-2006-4484.patch --- vlc-0.8.6d/extras/contrib/src/Patches/SDL_image-CVE-2006-4484.patch 1970-01-01 10:00:00.000000000 +1000 +++ vlc-0.8.6e/extras/contrib/src/Patches/SDL_image-CVE-2006-4484.patch 2008-02-28 05:41:55.000000000 +1100 @@ -0,0 +1,13 @@ +--- SDL_image/IMG_gif.orig.c 2008-02-01 11:58:19.000000000 +0100 ++++ SDL_image/IMG_gif.c 2008-02-01 11:58:28.000000000 +0100 +@@ -415,6 +415,10 @@ + static int table[2][(1 << MAX_LWZ_BITS)]; + static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp; + register int i; ++ ++ /* Fixed buffer overflow found by Michael Skladnikiewicz */ ++ if( input_code_size > MAX_LWZ_BITS ) ++ return -1; + + if (flag) { + set_code_size = input_code_size; diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Patches/x264-svn-darwin.patch vlc-0.8.6e/extras/contrib/src/Patches/x264-svn-darwin.patch --- vlc-0.8.6d/extras/contrib/src/Patches/x264-svn-darwin.patch 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/Patches/x264-svn-darwin.patch 2008-02-28 05:41:55.000000000 +1100 @@ -1,13 +1,13 @@ Index: configure =================================================================== ---- configure (revision 701) +--- configure (revision 715) +++ configure (working copy) @@ -396,7 +396,7 @@ CFLAGS="$CFLAGS -fPIC" ASFLAGS="$ASFLAGS -D__PIC__" # resolve textrels in the x86 asm -- LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" -+ LDFLAGS="$LDFLAGS -Wl" +- cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" ++ cc_check stdio.h -Wl && LDFLAGS="$LDFLAGS -Wl" fi if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then diff -Nur --exclude po vlc-0.8.6d/extras/contrib/src/Patches/xml2-win32.patch vlc-0.8.6e/extras/contrib/src/Patches/xml2-win32.patch --- vlc-0.8.6d/extras/contrib/src/Patches/xml2-win32.patch 2007-11-28 09:17:18.000000000 +1100 +++ vlc-0.8.6e/extras/contrib/src/Patches/xml2-win32.patch 2008-02-28 05:41:55.000000000 +1100 @@ -191,3 +191,23 @@ noinst_LTLIBRARIES = testdso.la testdso_la_SOURCES = testdso.c testdso_la_LDFLAGS = -module -rpath $(libdir) +--- xml/xmlmodule.c 2005-10-28 16:24:34.000000000 +0200 ++++ xml-new/xmlmodule.c 2006-10-11 13:56:13.748125000 +0200 +@@ -190,6 +190,8 @@ + return (0); + } + ++#ifndef _WIN32 ++ + #ifdef HAVE_DLOPEN + #ifdef HAVE_DLFCN_H + #include +@@ -288,7 +290,7 @@ + #endif /* HAVE_SHLLOAD */ + #endif /* ! HAVE_DLOPEN */ + +-#ifdef _WIN32 ++#else /* _WIN32 */ + + #include + diff -Nur --exclude po vlc-0.8.6d/extras/MacOSX/Resources/English.lproj/InfoPlist.strings vlc-0.8.6e/extras/MacOSX/Resources/English.lproj/InfoPlist.strings --- vlc-0.8.6d/extras/MacOSX/Resources/English.lproj/InfoPlist.strings 2007-11-28 00:11:35.000000000 +1100 +++ vlc-0.8.6e/extras/MacOSX/Resources/English.lproj/InfoPlist.strings 2008-02-25 06:01:54.000000000 +1100 @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "VLC"; -CFBundleShortVersionString = "0.8.6d"; -CFBundleGetInfoString = "VLC media player 0.8.6d Copyright (c) 1996-2007 the VideoLAN team"; -NSHumanReadableCopyright = "Copyright (c) 1996-2007 the VideoLAN team"; +CFBundleShortVersionString = "0.8.6e"; +CFBundleGetInfoString = "VLC media player 0.8.6e Copyright (c) 1996-2008 the VideoLAN team"; +NSHumanReadableCopyright = "Copyright (c) 1996-2008 the VideoLAN team"; diff -Nur --exclude po vlc-0.8.6d/extras/MacOSX/vlc.xcodeproj/project.pbxproj vlc-0.8.6e/extras/MacOSX/vlc.xcodeproj/project.pbxproj --- vlc-0.8.6d/extras/MacOSX/vlc.xcodeproj/project.pbxproj 2007-11-28 06:22:17.000000000 +1100 +++ vlc-0.8.6e/extras/MacOSX/vlc.xcodeproj/project.pbxproj 2008-02-25 06:01:54.000000000 +1100 @@ -190,6 +190,10 @@ CFBundleTypeIconFile Generic.icns + CFBundleTypeMIMETypes + + application/xspf+xml + CFBundleTypeName XSPF Playlist CFBundleTypeRole @@ -290,7 +294,11 @@ spx CFBundleTypeIconFile - generic.icns + ogg.icns + CFBundleTypeMIMETypes + + audio/ogg + CFBundleTypeName Speex Audio File CFBundleTypeRole @@ -462,8 +470,12 @@ CFBundleTypeIconFile ogg.icns + CFBundleTypeMIMETypes + + audio/ogg + CFBundleTypeName - OGG Multimedia Fle + Ogg Vorbis File CFBundleTypeRole Viewer @@ -522,6 +534,10 @@ CFBundleTypeIconFile ogg.icns + CFBundleTypeMIMETypes + + audio/ogg + CFBundleTypeName Ogg Audio File CFBundleTypeRole @@ -534,6 +550,10 @@ CFBundleTypeIconFile ogg.icns + CFBundleTypeMIMETypes + + video/ogg + CFBundleTypeName Ogg Video File CFBundleTypeRole @@ -542,6 +562,22 @@ CFBundleTypeExtensions + ogx + + CFBundleTypeIconFile + ogg.icns + CFBundleTypeMIMETypes + + application/ogg + + CFBundleTypeName + Ogg Application File + CFBundleTypeRole + Viewer + + + CFBundleTypeExtensions + mov moov qt @@ -880,6 +916,10 @@ CFBundleTypeIconFile generic.icns + CFBundleTypeMIMETypes + + audio/flac + CFBundleTypeName FLAC Audio File CFBundleTypeRole @@ -889,7 +929,7 @@ CFBundleExecutable VLC CFBundleGetInfoString - VLC media player 0.8.6d, Copyright (c) 1996-2007 the VideoLAN team. + VLC media player 0.8.6e, Copyright (c) 1996-2008 the VideoLAN team. CFBundleIconFile vlc.icns CFBundleIdentifier @@ -901,7 +941,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.6d + 0.8.6e CFBundleSignature VLC# CFBundleURLTypes @@ -968,7 +1008,7 @@ CFBundleVersion - 0.8.6d + 0.8.6e NSAppleScriptEnabled YES NSMainNibFile diff -Nur --exclude po vlc-0.8.6d/include/vlc_common.h vlc-0.8.6e/include/vlc_common.h --- vlc-0.8.6d/include/vlc_common.h 2007-11-27 00:08:12.000000000 +1100 +++ vlc-0.8.6e/include/vlc_common.h 2008-01-20 00:59:11.000000000 +1100 @@ -3,7 +3,7 @@ * Collection of useful common types and macros definitions ***************************************************************************** * Copyright (C) 1998-2005 the VideoLAN team - * $Id: vlc_common.h 17810 2006-11-16 13:36:28Z md $ + * $Id: vlc_common.h 24380 2008-01-18 07:48:17Z jpsaman $ * * Authors: Samuel Hocevar * Vincent Seguin @@ -599,6 +599,19 @@ } \ while( 0 ) +#define TAB_INIT( count, tab ) \ + do { \ + (count) = 0; \ + (tab) = NULL; \ + } while(0) + +#define TAB_CLEAN( count, tab ) \ + do { \ + if( tab ) free( tab ); \ + (count)= 0; \ + (tab)= NULL; \ + } while(0) + #define TAB_APPEND( count, tab, p ) \ if( (count) > 0 ) \ diff -Nur --exclude po vlc-0.8.6d/INSTALL.win32 vlc-0.8.6e/INSTALL.win32 --- vlc-0.8.6d/INSTALL.win32 2007-11-27 00:08:12.000000000 +1100 +++ vlc-0.8.6e/INSTALL.win32 2008-02-25 06:01:55.000000000 +1100 @@ -1,4 +1,4 @@ -$Id: INSTALL.win32 20558 2007-06-13 23:42:57Z jb $ +$Id: INSTALL.win32 25150 2008-02-14 19:19:14Z jb $ INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player @@ -89,7 +89,7 @@ * We also provide a package with all the libraries already compiled so it is actually really easy to compile a full-featured version of vlc (these compiled libraries will only work with mingw or cygwin): - http://download.videolan.org//pub/testing/win32/contrib-20070412-win32-0.8.6b-bin-gcc-3.4.5-only.tar.bz2 + http://download.videolan.org//pub/testing/win32/contrib-0.8.6e-gcc-3.4.5-only.tar.bz2 (Check out for more recent versions at the same location). All you need to do is extract it in your root directory (the include files diff -Nur --exclude po vlc-0.8.6d/ipkg/Makefile.in vlc-0.8.6e/ipkg/Makefile.in --- vlc-0.8.6d/ipkg/Makefile.in 2007-11-28 06:23:01.000000000 +1100 +++ vlc-0.8.6e/ipkg/Makefile.in 2008-02-25 06:07:11.000000000 +1100 @@ -118,6 +118,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -212,6 +213,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/loader/Makefile.in vlc-0.8.6e/loader/Makefile.in --- vlc-0.8.6d/loader/Makefile.in 2007-11-28 06:23:01.000000000 +1100 +++ vlc-0.8.6e/loader/Makefile.in 2008-02-25 06:07:11.000000000 +1100 @@ -159,6 +159,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -253,6 +254,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/m4/Makefile.in vlc-0.8.6e/m4/Makefile.in --- vlc-0.8.6d/m4/Makefile.in 2007-11-28 06:23:02.000000000 +1100 +++ vlc-0.8.6e/m4/Makefile.in 2008-02-25 06:07:11.000000000 +1100 @@ -118,6 +118,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -212,6 +213,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/Makefile.in vlc-0.8.6e/Makefile.in --- vlc-0.8.6d/Makefile.in 2007-11-28 06:23:58.000000000 +1100 +++ vlc-0.8.6e/Makefile.in 2008-02-25 06:07:51.000000000 +1100 @@ -211,6 +211,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -305,6 +306,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/cdda/Makefile.in vlc-0.8.6e/modules/access/cdda/Makefile.in --- vlc-0.8.6d/modules/access/cdda/Makefile.in 2007-11-28 06:23:04.000000000 +1100 +++ vlc-0.8.6e/modules/access/cdda/Makefile.in 2008-02-25 06:07:13.000000000 +1100 @@ -184,6 +184,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -278,6 +279,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/cdda.c vlc-0.8.6e/modules/access/cdda.c --- vlc-0.8.6d/modules/access/cdda.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/cdda.c 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * cdda.c : CD digital audio input module for vlc ***************************************************************************** * Copyright (C) 2000, 2003 the VideoLAN team - * $Id: cdda.c 20455 2007-06-07 17:34:50Z courmisch $ + * $Id: cdda.c 24238 2008-01-11 16:45:19Z fkuehne $ * * Authors: Laurent Aimar * Gildas Bazin @@ -622,9 +622,8 @@ /* If we have CDDB info, change the name */ if( p_sys->p_disc ) { - char *psz_result; cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i ); - if( t!= NULL ) + if( t != NULL ) { if( cddb_track_get_title( t ) != NULL ) { @@ -636,12 +635,12 @@ free( p_item->input.psz_name ); p_item->input.psz_name = strdup( cddb_track_get_title( t ) ); } - psz_result = cddb_track_get_artist( t ); - if( psz_result ) + if( cddb_track_get_artist( t ) != NULL ) { vlc_input_item_AddInfo( &p_item->input, - _(VLC_META_INFO_CAT), "%s", - _(VLC_META_ARTIST), psz_result ); + _(VLC_META_INFO_CAT), + _(VLC_META_ARTIST), "%s", + cddb_track_get_artist( t ) ); } } } diff -Nur --exclude po vlc-0.8.6d/modules/access/dc1394.c vlc-0.8.6e/modules/access/dc1394.c --- vlc-0.8.6d/modules/access/dc1394.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/dc1394.c 2007-12-28 22:05:29.000000000 +1100 @@ -585,7 +585,7 @@ CloseAudioDev( p_demux ); } - msg_Dbg( p_demux, "openened adev=`%s' %s %dHz", + msg_Dbg( p_demux, "opened adev=`%s' %s %dHz", psz_device, (p_sys->channels > 1) ? "stereo" : "mono", p_sys->i_sample_rate ); diff -Nur --exclude po vlc-0.8.6d/modules/access/dshow/crossbar.cpp vlc-0.8.6e/modules/access/dshow/crossbar.cpp --- vlc-0.8.6d/modules/access/dshow/crossbar.cpp 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/dshow/crossbar.cpp 2007-12-13 10:12:28.000000000 +1100 @@ -2,7 +2,7 @@ * crossbar.c : DirectShow access module for vlc ***************************************************************************** * Copyright (C) 2002 the VideoLAN team - * $Id: crossbar.cpp 15016 2006-03-31 23:07:01Z xtophe $ + * $Id: crossbar.cpp 23469 2007-12-06 00:58:02Z Trax $ * * Author: Damien Fouilleul * @@ -208,7 +208,7 @@ // remember connector type physicalType = inputPinPhysicalType; - msg_Dbg( p_this, "found existing route for ouput %ld (type %ld) to input %ld (type %ld)", + msg_Dbg( p_this, "found existing route for output %ld (type %ld) to input %ld (type %ld)", outputPinIndex, outputPinPhysicalType, inputPinIndex, inputPinPhysicalType ); @@ -260,7 +260,7 @@ p_sys->crossbar_routes[depth].AudioOutputIndex = outputPinIndexRelated; msg_Dbg( p_this, "crossbar at depth %d, found route for " - "ouput %ld (type %ld) to input %ld (type %ld)", depth, + "output %ld (type %ld) to input %ld (type %ld)", depth, outputPinIndex, outputPinPhysicalType, inputPinIndex, inputPinPhysicalType ); diff -Nur --exclude po vlc-0.8.6d/modules/access/dshow/Makefile.in vlc-0.8.6e/modules/access/dshow/Makefile.in --- vlc-0.8.6d/modules/access/dshow/Makefile.in 2007-11-28 06:23:04.000000000 +1100 +++ vlc-0.8.6e/modules/access/dshow/Makefile.in 2008-02-25 06:07:13.000000000 +1100 @@ -187,6 +187,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -281,6 +282,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/dvb/Makefile.in vlc-0.8.6e/modules/access/dvb/Makefile.in --- vlc-0.8.6d/modules/access/dvb/Makefile.in 2007-11-28 06:23:05.000000000 +1100 +++ vlc-0.8.6e/modules/access/dvb/Makefile.in 2008-02-25 06:07:14.000000000 +1100 @@ -184,6 +184,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -278,6 +279,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/ftp.c vlc-0.8.6e/modules/access/ftp.c --- vlc-0.8.6d/modules/access/ftp.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/ftp.c 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * ftp.c: FTP input module ***************************************************************************** * Copyright (C) 2001-2006 the VideoLAN team - * $Id: ftp.c 16774 2006-09-21 19:29:10Z hartman $ + * $Id: ftp.c 24145 2008-01-06 17:10:37Z Trax $ * * Authors: Laurent Aimar - original code * Rémi Denis-Courmont - EPSV support @@ -432,7 +432,9 @@ /* */ case ACCESS_SET_PAUSE_STATE: - /* Nothing to do */ + pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + if ( !pb_bool ) + return Seek( p_access, p_access->info.i_pos ); break; case ACCESS_GET_TITLE_INFO: diff -Nur --exclude po vlc-0.8.6d/modules/access/Makefile.in vlc-0.8.6e/modules/access/Makefile.in --- vlc-0.8.6d/modules/access/Makefile.in 2007-11-28 06:23:03.000000000 +1100 +++ vlc-0.8.6e/modules/access/Makefile.in 2008-02-25 06:07:13.000000000 +1100 @@ -537,6 +537,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -631,6 +632,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/mms/Makefile.in vlc-0.8.6e/modules/access/mms/Makefile.in --- vlc-0.8.6d/modules/access/mms/Makefile.in 2007-11-28 06:23:05.000000000 +1100 +++ vlc-0.8.6e/modules/access/mms/Makefile.in 2008-02-25 06:07:14.000000000 +1100 @@ -195,6 +195,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -289,6 +290,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/rtsp/Makefile.in vlc-0.8.6e/modules/access/rtsp/Makefile.in --- vlc-0.8.6d/modules/access/rtsp/Makefile.in 2007-11-28 06:23:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/rtsp/Makefile.in 2008-02-25 06:07:14.000000000 +1100 @@ -203,6 +203,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -297,6 +298,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/rtsp/real_rmff.c vlc-0.8.6e/modules/access/rtsp/real_rmff.c --- vlc-0.8.6d/modules/access/rtsp/real_rmff.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/rtsp/real_rmff.c 2008-02-28 05:27:36.000000000 +1100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: real_rmff.c 14187 2006-02-07 16:37:40Z courmisch $ + * $Id: real_rmff.c 25362 2008-02-26 23:59:58Z thresh $ * * functions for real media file format * adopted from joschkas real tools @@ -35,157 +35,184 @@ * writes header data to a buffer */ -static void rmff_dump_fileheader(rmff_fileheader_t *fileheader, char *buffer) { +static int rmff_dump_fileheader(rmff_fileheader_t *fileheader, uint8_t *buffer, int bufsize) { + if (!fileheader) return 0; + if (bufsize < RMFF_FILEHEADER_SIZE) + return -1; + + fileheader->object_id=BE_32(&fileheader->object_id); + fileheader->size=BE_32(&fileheader->size); + fileheader->object_version=BE_16(&fileheader->object_version); + fileheader->file_version=BE_32(&fileheader->file_version); + fileheader->num_headers=BE_32(&fileheader->num_headers); + + memcpy(buffer, fileheader, 8); + memcpy(&buffer[8], &fileheader->object_version, 2); + memcpy(&buffer[10], &fileheader->file_version, 8); + + fileheader->size=BE_32(&fileheader->size); + fileheader->object_version=BE_16(&fileheader->object_version); + fileheader->file_version=BE_32(&fileheader->file_version); + fileheader->num_headers=BE_32(&fileheader->num_headers); + fileheader->object_id=BE_32(&fileheader->object_id); + + return RMFF_FILEHEADER_SIZE; +} + +static int rmff_dump_prop(rmff_prop_t *prop, uint8_t *buffer, int bufsize) { + + if (!prop) return 0; + + if (bufsize < RMFF_PROPHEADER_SIZE) + return -1; + + prop->object_id=BE_32(&prop->object_id); + prop->size=BE_32(&prop->size); + prop->object_version=BE_16(&prop->object_version); + prop->max_bit_rate=BE_32(&prop->max_bit_rate); + prop->avg_bit_rate=BE_32(&prop->avg_bit_rate); + prop->max_packet_size=BE_32(&prop->max_packet_size); + prop->avg_packet_size=BE_32(&prop->avg_packet_size); + prop->num_packets=BE_32(&prop->num_packets); + prop->duration=BE_32(&prop->duration); + prop->preroll=BE_32(&prop->preroll); + prop->index_offset=BE_32(&prop->index_offset); + prop->data_offset=BE_32(&prop->data_offset); + prop->num_streams=BE_16(&prop->num_streams); + prop->flags=BE_16(&prop->flags); + + memcpy(buffer, prop, 8); + memcpy(&buffer[8], &prop->object_version, 2); + memcpy(&buffer[10], &prop->max_bit_rate, 36); + memcpy(&buffer[46], &prop->num_streams, 2); + memcpy(&buffer[48], &prop->flags, 2); + + prop->size=BE_32(&prop->size); + prop->object_version=BE_16(&prop->object_version); + prop->max_bit_rate=BE_32(&prop->max_bit_rate); + prop->avg_bit_rate=BE_32(&prop->avg_bit_rate); + prop->max_packet_size=BE_32(&prop->max_packet_size); + prop->avg_packet_size=BE_32(&prop->avg_packet_size); + prop->num_packets=BE_32(&prop->num_packets); + prop->duration=BE_32(&prop->duration); + prop->preroll=BE_32(&prop->preroll); + prop->index_offset=BE_32(&prop->index_offset); + prop->data_offset=BE_32(&prop->data_offset); + prop->num_streams=BE_16(&prop->num_streams); + prop->flags=BE_16(&prop->flags); + prop->object_id=BE_32(&prop->object_id); + + return RMFF_PROPHEADER_SIZE; +} + +static int rmff_dump_mdpr(rmff_mdpr_t *mdpr, uint8_t *buffer, int bufsize) { + + int s1, s2, s3; + + if (!mdpr) return 0; + if (bufsize < RMFF_MDPRHEADER_SIZE + mdpr->type_specific_len + + mdpr->stream_name_size + mdpr->mime_type_size) + return -1; + + mdpr->object_id=BE_32(&mdpr->object_id); + mdpr->size=BE_32(&mdpr->size); + mdpr->object_version=BE_16(&mdpr->object_version); + mdpr->stream_number=BE_16(&mdpr->stream_number); + mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate); + mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate); + mdpr->max_packet_size=BE_32(&mdpr->max_packet_size); + mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size); + mdpr->start_time=BE_32(&mdpr->start_time); + mdpr->preroll=BE_32(&mdpr->preroll); + mdpr->duration=BE_32(&mdpr->duration); + + memcpy(buffer, mdpr, 8); + memcpy(&buffer[8], &mdpr->object_version, 2); + memcpy(&buffer[10], &mdpr->stream_number, 2); + memcpy(&buffer[12], &mdpr->max_bit_rate, 28); + memcpy(&buffer[40], &mdpr->stream_name_size, 1); + s1=mdpr->stream_name_size; + memcpy(&buffer[41], mdpr->stream_name, s1); + + memcpy(&buffer[41+s1], &mdpr->mime_type_size, 1); + s2=mdpr->mime_type_size; + memcpy(&buffer[42+s1], mdpr->mime_type, s2); + + mdpr->type_specific_len=BE_32(&mdpr->type_specific_len); + memcpy(&buffer[42+s1+s2], &mdpr->type_specific_len, 4); + mdpr->type_specific_len=BE_32(&mdpr->type_specific_len); + s3=mdpr->type_specific_len; + memcpy(&buffer[46+s1+s2], mdpr->type_specific_data, s3); + + mdpr->size=BE_32(&mdpr->size); + mdpr->stream_number=BE_16(&mdpr->stream_number); + mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate); + mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate); + mdpr->max_packet_size=BE_32(&mdpr->max_packet_size); + mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size); + mdpr->start_time=BE_32(&mdpr->start_time); + mdpr->preroll=BE_32(&mdpr->preroll); + mdpr->duration=BE_32(&mdpr->duration); + mdpr->object_id=BE_32(&mdpr->object_id); + + return RMFF_MDPRHEADER_SIZE + s1 + s2 + s3; +} + +static int rmff_dump_cont(rmff_cont_t *cont, uint8_t *buffer, int bufsize) { + + int p; + + if (!cont) return 0; + + if (bufsize < RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + \ + cont->copyright_len + cont->comment_len) + return -1; + + cont->object_id=BE_32(&cont->object_id); + cont->size=BE_32(&cont->size); + cont->object_version=BE_16(&cont->object_version); + + memcpy(buffer, cont, 8); + memcpy(&buffer[8], &cont->object_version, 2); + + cont->title_len=BE_16(&cont->title_len); + memcpy(&buffer[10], &cont->title_len, 2); + cont->title_len=BE_16(&cont->title_len); + memcpy(&buffer[12], cont->title, cont->title_len); + p=12+cont->title_len; + + cont->author_len=BE_16(&cont->author_len); + memcpy(&buffer[p], &cont->author_len, 2); + cont->author_len=BE_16(&cont->author_len); + memcpy(&buffer[p+2], cont->author, cont->author_len); + p+=2+cont->author_len; + + cont->copyright_len=BE_16(&cont->copyright_len); + memcpy(&buffer[p], &cont->copyright_len, 2); + cont->copyright_len=BE_16(&cont->copyright_len); + memcpy(&buffer[p+2], cont->copyright, cont->copyright_len); + p+=2+cont->copyright_len; + + cont->comment_len=BE_16(&cont->comment_len); + memcpy(&buffer[p], &cont->comment_len, 2); + cont->comment_len=BE_16(&cont->comment_len); + memcpy(&buffer[p+2], cont->comment, cont->comment_len); + + cont->size=BE_32(&cont->size); + cont->object_version=BE_16(&cont->object_version); + cont->object_id=BE_32(&cont->object_id); + + return RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + \ + cont->copyright_len + cont->comment_len; +} + +static int rmff_dump_dataheader(rmff_data_t *data, uint8_t *buffer, int bufsize) { + + if (!data) return 0; + + if (bufsize < RMFF_DATAHEADER_SIZE) + return -1; - if (!fileheader) return; - fileheader->object_id=BE_32(&fileheader->object_id); - fileheader->size=BE_32(&fileheader->size); - fileheader->object_version=BE_16(&fileheader->object_version); - fileheader->file_version=BE_32(&fileheader->file_version); - fileheader->num_headers=BE_32(&fileheader->num_headers); - - memcpy(buffer, fileheader, 8); - memcpy(&buffer[8], &fileheader->object_version, 2); - memcpy(&buffer[10], &fileheader->file_version, 8); - - fileheader->size=BE_32(&fileheader->size); - fileheader->object_version=BE_16(&fileheader->object_version); - fileheader->file_version=BE_32(&fileheader->file_version); - fileheader->num_headers=BE_32(&fileheader->num_headers); - fileheader->object_id=BE_32(&fileheader->object_id); -} - -static void rmff_dump_prop(rmff_prop_t *prop, char *buffer) { - - if (!prop) return; - prop->object_id=BE_32(&prop->object_id); - prop->size=BE_32(&prop->size); - prop->object_version=BE_16(&prop->object_version); - prop->max_bit_rate=BE_32(&prop->max_bit_rate); - prop->avg_bit_rate=BE_32(&prop->avg_bit_rate); - prop->max_packet_size=BE_32(&prop->max_packet_size); - prop->avg_packet_size=BE_32(&prop->avg_packet_size); - prop->num_packets=BE_32(&prop->num_packets); - prop->duration=BE_32(&prop->duration); - prop->preroll=BE_32(&prop->preroll); - prop->index_offset=BE_32(&prop->index_offset); - prop->data_offset=BE_32(&prop->data_offset); - prop->num_streams=BE_16(&prop->num_streams); - prop->flags=BE_16(&prop->flags); - - memcpy(buffer, prop, 8); - memcpy(&buffer[8], &prop->object_version, 2); - memcpy(&buffer[10], &prop->max_bit_rate, 36); - memcpy(&buffer[46], &prop->num_streams, 2); - memcpy(&buffer[48], &prop->flags, 2); - - prop->size=BE_32(&prop->size); - prop->object_version=BE_16(&prop->object_version); - prop->max_bit_rate=BE_32(&prop->max_bit_rate); - prop->avg_bit_rate=BE_32(&prop->avg_bit_rate); - prop->max_packet_size=BE_32(&prop->max_packet_size); - prop->avg_packet_size=BE_32(&prop->avg_packet_size); - prop->num_packets=BE_32(&prop->num_packets); - prop->duration=BE_32(&prop->duration); - prop->preroll=BE_32(&prop->preroll); - prop->index_offset=BE_32(&prop->index_offset); - prop->data_offset=BE_32(&prop->data_offset); - prop->num_streams=BE_16(&prop->num_streams); - prop->flags=BE_16(&prop->flags); - prop->object_id=BE_32(&prop->object_id); -} - -static void rmff_dump_mdpr(rmff_mdpr_t *mdpr, char *buffer) { - - int s1, s2, s3; - - if (!mdpr) return; - mdpr->object_id=BE_32(&mdpr->object_id); - mdpr->size=BE_32(&mdpr->size); - mdpr->object_version=BE_16(&mdpr->object_version); - mdpr->stream_number=BE_16(&mdpr->stream_number); - mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate); - mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate); - mdpr->max_packet_size=BE_32(&mdpr->max_packet_size); - mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size); - mdpr->start_time=BE_32(&mdpr->start_time); - mdpr->preroll=BE_32(&mdpr->preroll); - mdpr->duration=BE_32(&mdpr->duration); - - memcpy(buffer, mdpr, 8); - memcpy(&buffer[8], &mdpr->object_version, 2); - memcpy(&buffer[10], &mdpr->stream_number, 2); - memcpy(&buffer[12], &mdpr->max_bit_rate, 28); - memcpy(&buffer[40], &mdpr->stream_name_size, 1); - s1=mdpr->stream_name_size; - memcpy(&buffer[41], mdpr->stream_name, s1); - - memcpy(&buffer[41+s1], &mdpr->mime_type_size, 1); - s2=mdpr->mime_type_size; - memcpy(&buffer[42+s1], mdpr->mime_type, s2); - - mdpr->type_specific_len=BE_32(&mdpr->type_specific_len); - memcpy(&buffer[42+s1+s2], &mdpr->type_specific_len, 4); - mdpr->type_specific_len=BE_32(&mdpr->type_specific_len); - s3=mdpr->type_specific_len; - memcpy(&buffer[46+s1+s2], mdpr->type_specific_data, s3); - - mdpr->size=BE_32(&mdpr->size); - mdpr->stream_number=BE_16(&mdpr->stream_number); - mdpr->max_bit_rate=BE_32(&mdpr->max_bit_rate); - mdpr->avg_bit_rate=BE_32(&mdpr->avg_bit_rate); - mdpr->max_packet_size=BE_32(&mdpr->max_packet_size); - mdpr->avg_packet_size=BE_32(&mdpr->avg_packet_size); - mdpr->start_time=BE_32(&mdpr->start_time); - mdpr->preroll=BE_32(&mdpr->preroll); - mdpr->duration=BE_32(&mdpr->duration); - mdpr->object_id=BE_32(&mdpr->object_id); - -} - -static void rmff_dump_cont(rmff_cont_t *cont, char *buffer) { - - int p; - - if (!cont) return; - cont->object_id=BE_32(&cont->object_id); - cont->size=BE_32(&cont->size); - cont->object_version=BE_16(&cont->object_version); - - memcpy(buffer, cont, 8); - memcpy(&buffer[8], &cont->object_version, 2); - - cont->title_len=BE_16(&cont->title_len); - memcpy(&buffer[10], &cont->title_len, 2); - cont->title_len=BE_16(&cont->title_len); - memcpy(&buffer[12], cont->title, cont->title_len); - p=12+cont->title_len; - - cont->author_len=BE_16(&cont->author_len); - memcpy(&buffer[p], &cont->author_len, 2); - cont->author_len=BE_16(&cont->author_len); - memcpy(&buffer[p+2], cont->author, cont->author_len); - p+=2+cont->author_len; - - cont->copyright_len=BE_16(&cont->copyright_len); - memcpy(&buffer[p], &cont->copyright_len, 2); - cont->copyright_len=BE_16(&cont->copyright_len); - memcpy(&buffer[p+2], cont->copyright, cont->copyright_len); - p+=2+cont->copyright_len; - - cont->comment_len=BE_16(&cont->comment_len); - memcpy(&buffer[p], &cont->comment_len, 2); - cont->comment_len=BE_16(&cont->comment_len); - memcpy(&buffer[p+2], cont->comment, cont->comment_len); - - cont->size=BE_32(&cont->size); - cont->object_version=BE_16(&cont->object_version); - cont->object_id=BE_32(&cont->object_id); -} - -static void rmff_dump_dataheader(rmff_data_t *data, char *buffer) { - - if (!data) return; data->object_id=BE_32(&data->object_id); data->size=BE_32(&data->size); @@ -202,33 +229,50 @@ data->size=BE_32(&data->size); data->object_version=BE_16(&data->object_version); data->object_id=BE_32(&data->object_id); + + return RMFF_DATAHEADER_SIZE; } -int rmff_dump_header(rmff_header_t *h, char *buffer, int max) { +int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max) { + uint8_t *buffer = buf_gen; - int written=0; - rmff_mdpr_t **stream=h->streams; + int written=0, size; + rmff_mdpr_t **stream=h->streams; - rmff_dump_fileheader(h->fileheader, &buffer[written]); - written+=h->fileheader->size; - rmff_dump_prop(h->prop, &buffer[written]); - written+=h->prop->size; - rmff_dump_cont(h->cont, &buffer[written]); - written+=h->cont->size; - if (stream) - { - while(*stream) - { - rmff_dump_mdpr(*stream, &buffer[written]); - written+=(*stream)->size; - stream++; + if ((size=rmff_dump_fileheader(h->fileheader, &buffer[written], max)) < 0) + return -1; + + written += size; + max -= size; + + if ((size=rmff_dump_prop(h->prop, &buffer[written], max)) < 0) + return -1; + + written += size; + max -= size; + + if ((size=rmff_dump_cont(h->cont, &buffer[written], max)) < 0) + return -1; + + written += size; + max -= size; + + if (stream) { + while(*stream) { + if ((size=rmff_dump_mdpr(*stream, &buffer[written], max)) < 0) + return -1; + written += size; + max -= size; + stream++; + } } - } - rmff_dump_dataheader(h->data, &buffer[written]); - written+=18; + if ((size=rmff_dump_dataheader(h->data, &buffer[written], max)) < 0) + return -1; + + written+=size; - return written; + return written; } void rmff_dump_pheader(rmff_pheader_t *h, char *data) { diff -Nur --exclude po vlc-0.8.6d/modules/access/rtsp/real_rmff.h vlc-0.8.6e/modules/access/rtsp/real_rmff.h --- vlc-0.8.6d/modules/access/rtsp/real_rmff.h 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/rtsp/real_rmff.h 2008-02-28 05:27:36.000000000 +1100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: real_rmff.h 14187 2006-02-07 16:37:40Z courmisch $ + * $Id: real_rmff.h 25362 2008-02-26 23:59:58Z thresh $ * * some functions for real media file headers * adopted from joschkas real tools @@ -29,6 +29,12 @@ #define RMFF_HEADER_SIZE 0x12 +#define RMFF_FILEHEADER_SIZE 18 +#define RMFF_PROPHEADER_SIZE 50 +#define RMFF_MDPRHEADER_SIZE 46 +#define RMFF_CONTHEADER_SIZE 18 +#define RMFF_DATAHEADER_SIZE 18 + #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ (((long)(unsigned char)(ch3) ) | \ ( (long)(unsigned char)(ch2) << 8 ) | \ @@ -234,7 +240,7 @@ /* * dumps the header to . is the size of */ -int rmff_dump_header(rmff_header_t *h, char *buffer, int max); +int rmff_dump_header(rmff_header_t *h, void *buffer, int max); /* * dumps a packet header diff -Nur --exclude po vlc-0.8.6d/modules/access/rtsp/real_sdpplin.c vlc-0.8.6e/modules/access/rtsp/real_sdpplin.c --- vlc-0.8.6d/modules/access/rtsp/real_sdpplin.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/rtsp/real_sdpplin.c 2008-02-28 05:27:36.000000000 +1100 @@ -17,13 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: real_sdpplin.c 14187 2006-02-07 16:37:40Z courmisch $ + * $Id: real_sdpplin.c 25363 2008-02-27 00:07:15Z thresh $ * * sdp/sdpplin parser. * */ #include "real.h" +#define BUFLEN 32000 /* * Decodes base64 strings (based upon b64 package) @@ -88,10 +89,10 @@ return (nlptr) ? nlptr + 1 : NULL; } -static int filter(const char *in, const char *filter, char **out) { +static int filter(const char *in, const char *filter, char **out, size_t outlen) { int flen=strlen(filter); - int len; + size_t len; if (!in) return 0; @@ -100,6 +101,11 @@ if(in[flen]=='"') flen++; if(in[len-1]==13) len--; if(in[len-1]=='"') len--; + if( len-flen+1 > outlen ) + { + printf("Discarding end of string to avoid overflow"); + len=outlen+flen-1; + } memcpy(*out, in+flen, len-flen+1); (*out)[len-flen]=0; return len-flen; @@ -110,8 +116,8 @@ static sdpplin_stream_t *sdpplin_parse_stream(char **data) { sdpplin_stream_t *desc = malloc(sizeof(sdpplin_stream_t)); - char *buf = malloc(32000); - char *decoded = malloc(32000); + char *buf = malloc(BUFLEN); + char *decoded = malloc(BUFLEN); int handled; if( !desc ) return NULL; @@ -120,7 +126,7 @@ if( !buf ) goto error; if( !decoded ) goto error; - if (filter(*data, "m=", &buf)) { + if (filter(*data, "m=", &buf, BUFLEN)) { desc->id = strdup(buf); } else { lprintf("sdpplin: no m= found.\n"); @@ -131,61 +137,63 @@ while (*data && **data && *data[0]!='m') { handled=0; - if(filter(*data,"a=control:streamid=",&buf)) { + if(filter(*data,"a=control:streamid=",&buf, BUFLEN)) { desc->stream_id=atoi(buf); handled=1; *data=nl(*data); } - if(filter(*data,"a=MaxBitRate:integer;",&buf)) { + if(filter(*data,"a=MaxBitRate:integer;",&buf, BUFLEN)) { desc->max_bit_rate=atoi(buf); if (!desc->avg_bit_rate) desc->avg_bit_rate=desc->max_bit_rate; handled=1; *data=nl(*data); } - if(filter(*data,"a=MaxPacketSize:integer;",&buf)) { + if(filter(*data,"a=MaxPacketSize:integer;",&buf, BUFLEN)) { desc->max_packet_size=atoi(buf); if (!desc->avg_packet_size) desc->avg_packet_size=desc->max_packet_size; handled=1; *data=nl(*data); } - if(filter(*data,"a=StartTime:integer;",&buf)) { + if(filter(*data,"a=StartTime:integer;",&buf, BUFLEN)) { desc->start_time=atoi(buf); handled=1; *data=nl(*data); } - if(filter(*data,"a=Preroll:integer;",&buf)) { + if(filter(*data,"a=Preroll:integer;",&buf, BUFLEN)) { desc->preroll=atoi(buf); handled=1; *data=nl(*data); } - if(filter(*data,"a=length:npt=",&buf)) { + if(filter(*data,"a=length:npt=",&buf, BUFLEN)) { desc->duration=(uint32_t)(atof(buf)*1000); handled=1; *data=nl(*data); } - if(filter(*data,"a=StreamName:string;",&buf)) { + if(filter(*data,"a=StreamName:string;",&buf, BUFLEN)) { desc->stream_name=strdup(buf); desc->stream_name_size=strlen(desc->stream_name); handled=1; *data=nl(*data); } - if(filter(*data,"a=mimetype:string;",&buf)) { + if(filter(*data,"a=mimetype:string;",&buf, BUFLEN)) { desc->mime_type=strdup(buf); desc->mime_type_size=strlen(desc->mime_type); handled=1; *data=nl(*data); } - if(filter(*data,"a=OpaqueData:buffer;",&buf)) { + if(filter(*data,"a=OpaqueData:buffer;",&buf, BUFLEN)) { decoded = b64_decode(buf, decoded, &(desc->mlti_data_size)); - desc->mlti_data = malloc(sizeof(char)*desc->mlti_data_size); - memcpy(desc->mlti_data, decoded, desc->mlti_data_size); - handled=1; - *data=nl(*data); - lprintf("mlti_data_size: %i\n", desc->mlti_data_size); + if ( decoded != NULL ) { + desc->mlti_data = malloc(sizeof(char)*desc->mlti_data_size); + memcpy(desc->mlti_data, decoded, desc->mlti_data_size); + handled=1; + *data=nl(*data); + lprintf("mlti_data_size: %i\n", desc->mlti_data_size); + } } - if(filter(*data,"a=ASMRuleBook:string;",&buf)) { + if(filter(*data,"a=ASMRuleBook:string;",&buf, BUFLEN)) { desc->asm_rule_book=strdup(buf); handled=1; *data=nl(*data); @@ -216,8 +224,8 @@ sdpplin_t *desc = malloc(sizeof(sdpplin_t)); sdpplin_stream_t *stream; - char *buf=malloc(3200); - char *decoded=malloc(3200); + char *buf=malloc(BUFLEN); + char *decoded=malloc(BUFLEN); int handled; int len; @@ -231,48 +239,63 @@ free( desc ); return NULL; } + + desc->stream = NULL; + memset(desc, 0, sizeof(sdpplin_t)); while (data && *data) { handled=0; - if (filter(data, "m=", &buf)) { - stream=sdpplin_parse_stream(&data); - lprintf("got data for stream id %u\n", stream->stream_id); - desc->stream[stream->stream_id]=stream; - continue; + if (filter(data, "m=", &buf, BUFLEN)) { + if ( !desc->stream ) { + fprintf(stderr, "sdpplin.c: stream identifier found before stream count, skipping."); + continue; + } + stream=sdpplin_parse_stream(&data); + lprintf("got data for stream id %u\n", stream->stream_id); + desc->stream[stream->stream_id]=stream; + continue; } - if(filter(data,"a=Title:buffer;",&buf)) { + if(filter(data,"a=Title:buffer;",&buf, BUFLEN)) { decoded=b64_decode(buf, decoded, &len); - desc->title=strdup(decoded); - handled=1; - data=nl(data); + if ( decoded != NULL ) { + desc->title=strdup(decoded); + handled=1; + data=nl(data); + } } - if(filter(data,"a=Author:buffer;",&buf)) { + if(filter(data,"a=Author:buffer;",&buf, BUFLEN)) { decoded=b64_decode(buf, decoded, &len); - desc->author=strdup(decoded); - handled=1; - data=nl(data); + if ( decoded != NULL ) { + desc->author=strdup(decoded); + handled=1; + data=nl(data); + } } - if(filter(data,"a=Copyright:buffer;",&buf)) { + if(filter(data,"a=Copyright:buffer;",&buf, BUFLEN)) { decoded=b64_decode(buf, decoded, &len); - desc->copyright=strdup(decoded); - handled=1; - data=nl(data); + if ( decoded != NULL ) { + desc->copyright=strdup(decoded); + handled=1; + data=nl(data); + } } - if(filter(data,"a=Abstract:buffer;",&buf)) { + if(filter(data,"a=Abstract:buffer;",&buf, BUFLEN)) { decoded=b64_decode(buf, decoded, &len); - desc->abstract=strdup(decoded); - handled=1; - data=nl(data); + if ( decoded != NULL ) { + desc->abstract=strdup(decoded); + handled=1; + data=nl(data); + } } - if(filter(data,"a=StreamCount:integer;",&buf)) { + if(filter(data,"a=StreamCount:integer;",&buf, BUFLEN)) { desc->stream_count=atoi(buf); desc->stream = malloc(sizeof(sdpplin_stream_t*)*desc->stream_count); handled=1; data=nl(data); } - if(filter(data,"a=Flags:integer;",&buf)) { + if(filter(data,"a=Flags:integer;",&buf, BUFLEN)) { desc->flags=atoi(buf); handled=1; data=nl(data); diff -Nur --exclude po vlc-0.8.6d/modules/access/screen/Makefile.in vlc-0.8.6e/modules/access/screen/Makefile.in --- vlc-0.8.6d/modules/access/screen/Makefile.in 2007-11-28 06:23:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/screen/Makefile.in 2008-02-25 06:07:15.000000000 +1100 @@ -215,6 +215,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -309,6 +310,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/v4l/Makefile.in vlc-0.8.6e/modules/access/v4l/Makefile.in --- vlc-0.8.6d/modules/access/v4l/Makefile.in 2007-11-28 06:23:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/v4l/Makefile.in 2008-02-25 06:07:15.000000000 +1100 @@ -174,6 +174,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -268,6 +269,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/v4l/v4l.c vlc-0.8.6e/modules/access/v4l/v4l.c --- vlc-0.8.6d/modules/access/v4l/v4l.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/access/v4l/v4l.c 2007-12-28 22:05:29.000000000 +1100 @@ -2,7 +2,7 @@ * v4l.c : Video4Linux input module for vlc ***************************************************************************** * Copyright (C) 2002-2004 the VideoLAN team - * $Id: v4l.c 15016 2006-03-31 23:07:01Z xtophe $ + * $Id: v4l.c 23864 2007-12-25 20:49:49Z Trax $ * * Author: Laurent Aimar * Paul Forgey @@ -1364,7 +1364,7 @@ goto adev_fail; } - msg_Dbg( p_demux, "openened adev=`%s' %s %dHz", + msg_Dbg( p_demux, "opened adev=`%s' %s %dHz", psz_device, p_sys->b_stereo ? "stereo" : "mono", p_sys->i_sample_rate ); diff -Nur --exclude po vlc-0.8.6d/modules/access/vcd/Makefile.in vlc-0.8.6e/modules/access/vcd/Makefile.in --- vlc-0.8.6d/modules/access/vcd/Makefile.in 2007-11-28 06:23:07.000000000 +1100 +++ vlc-0.8.6e/modules/access/vcd/Makefile.in 2008-02-25 06:07:15.000000000 +1100 @@ -179,6 +179,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -273,6 +274,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access/vcdx/Makefile.in vlc-0.8.6e/modules/access/vcdx/Makefile.in --- vlc-0.8.6d/modules/access/vcdx/Makefile.in 2007-11-28 06:23:07.000000000 +1100 +++ vlc-0.8.6e/modules/access/vcdx/Makefile.in 2008-02-25 06:07:16.000000000 +1100 @@ -185,6 +185,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -279,6 +280,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access_filter/Makefile.in vlc-0.8.6e/modules/access_filter/Makefile.in --- vlc-0.8.6d/modules/access_filter/Makefile.in 2007-11-28 06:23:08.000000000 +1100 +++ vlc-0.8.6e/modules/access_filter/Makefile.in 2008-02-25 06:07:16.000000000 +1100 @@ -245,6 +245,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -339,6 +340,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/access_output/Makefile.in vlc-0.8.6e/modules/access_output/Makefile.in --- vlc-0.8.6d/modules/access_output/Makefile.in 2007-11-28 06:23:09.000000000 +1100 +++ vlc-0.8.6e/modules/access_output/Makefile.in 2008-02-25 06:07:17.000000000 +1100 @@ -305,6 +305,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -399,6 +400,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/audio_filter/channel_mixer/Makefile.in vlc-0.8.6e/modules/audio_filter/channel_mixer/Makefile.in --- vlc-0.8.6d/modules/audio_filter/channel_mixer/Makefile.in 2007-11-28 06:23:10.000000000 +1100 +++ vlc-0.8.6e/modules/audio_filter/channel_mixer/Makefile.in 2008-02-25 06:07:17.000000000 +1100 @@ -277,6 +277,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -371,6 +372,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/audio_filter/channel_mixer/simple.c vlc-0.8.6e/modules/audio_filter/channel_mixer/simple.c --- vlc-0.8.6d/modules/audio_filter/channel_mixer/simple.c 2007-11-27 00:08:07.000000000 +1100 +++ vlc-0.8.6e/modules/audio_filter/channel_mixer/simple.c 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * simple.c : simple channel mixer plug-in (only 7/7.1/5/5.1 -> Stereo for now) ***************************************************************************** * Copyright (C) 2002, 2006 the VideoLAN team - * $Id: simple.c 14997 2006-03-31 15:15:07Z fkuehne $ + * $Id: simple.c 25233 2008-02-21 10:19:49Z Trax $ * * Authors: Gildas Bazin * diff -Nur --exclude po vlc-0.8.6d/modules/audio_filter/converter/dtstospdif.c vlc-0.8.6e/modules/audio_filter/converter/dtstospdif.c --- vlc-0.8.6d/modules/audio_filter/converter/dtstospdif.c 2007-11-27 00:08:07.000000000 +1100 +++ vlc-0.8.6e/modules/audio_filter/converter/dtstospdif.c 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * dtstospdif.c : encapsulates DTS frames into S/PDIF packets ***************************************************************************** * Copyright (C) 2003, 2006 the VideoLAN team - * $Id: dtstospdif.c 14997 2006-03-31 15:15:07Z fkuehne $ + * $Id: dtstospdif.c 23994 2008-01-01 19:07:13Z pdherbemont $ * * Authors: Jon Lech Johansen * @@ -156,6 +156,7 @@ for( i_frame = 0; i_frame < 3; i_frame++ ) { + uint16_t i_length_padded = i_length; byte_t * p_out = p_out_buf->p_buffer + (i_frame * i_fz); byte_t * p_in = p_filter->p_sys->p_buf + (i_frame * i_length); @@ -202,6 +203,13 @@ p_tmp += 2; p_in += 2; } #endif + /* If i_length is odd, we have to adjust swapping a bit.. */ + if( i_length & 1 ) + { + p_out[8+i_length-1] = 0; + p_out[8+i_length] = p_in[i_length-1]; + i_length_padded++; + } } else { @@ -210,8 +218,8 @@ if( i_fz > i_length + 8 ) { - p_filter->p_vlc->pf_memset( p_out + 8 + i_length, 0, - i_fz - i_length - 8 ); + p_filter->p_vlc->pf_memset( p_out + 8 + i_length_padded, 0, + i_fz - i_length_padded - 8 ); } } diff -Nur --exclude po vlc-0.8.6d/modules/audio_filter/converter/Makefile.in vlc-0.8.6e/modules/audio_filter/converter/Makefile.in --- vlc-0.8.6d/modules/audio_filter/converter/Makefile.in 2007-11-28 06:23:11.000000000 +1100 +++ vlc-0.8.6e/modules/audio_filter/converter/Makefile.in 2008-02-25 06:07:18.000000000 +1100 @@ -629,6 +629,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -723,6 +724,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/audio_filter/Makefile.in vlc-0.8.6e/modules/audio_filter/Makefile.in --- vlc-0.8.6d/modules/audio_filter/Makefile.in 2007-11-28 06:23:09.000000000 +1100 +++ vlc-0.8.6e/modules/audio_filter/Makefile.in 2008-02-25 06:07:17.000000000 +1100 @@ -254,6 +254,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -348,6 +349,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/audio_filter/resampler/Makefile.in vlc-0.8.6e/modules/audio_filter/resampler/Makefile.in --- vlc-0.8.6d/modules/audio_filter/resampler/Makefile.in 2007-11-28 06:23:12.000000000 +1100 +++ vlc-0.8.6e/modules/audio_filter/resampler/Makefile.in 2008-02-25 06:07:19.000000000 +1100 @@ -271,6 +271,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -365,6 +366,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/audio_mixer/Makefile.in vlc-0.8.6e/modules/audio_mixer/Makefile.in --- vlc-0.8.6d/modules/audio_mixer/Makefile.in 2007-11-28 06:23:13.000000000 +1100 +++ vlc-0.8.6e/modules/audio_mixer/Makefile.in 2008-02-25 06:07:19.000000000 +1100 @@ -237,6 +237,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -331,6 +332,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/audio_output/alsa.c vlc-0.8.6e/modules/audio_output/alsa.c --- vlc-0.8.6d/modules/audio_output/alsa.c 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/audio_output/alsa.c 2008-02-25 06:01:52.000000000 +1100 @@ -2,7 +2,7 @@ * alsa.c : alsa plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 the VideoLAN team - * $Id: alsa.c 23055 2007-11-13 17:12:18Z funman $ + * $Id: alsa.c 25261 2008-02-22 17:31:20Z thresh $ * * Authors: Henri Fallon - Original Author * Jeffrey Baker - Port to ALSA 1.0 API @@ -571,34 +571,34 @@ p_aout->output.output.i_rate ); } - /* Set buffer size. */ + /* Set period size. */ #ifdef HAVE_ALSA_NEW_API - if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, - p_hw, &i_buffer_size ) ) < 0 ) + if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, + p_hw, &i_period_size, NULL ) ) < 0 ) #else - if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, - p_hw, i_buffer_size ) ) < 0 ) + if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, + p_hw, i_period_size, NULL ) ) < 0 ) #endif { - msg_Err( p_aout, "unable to set buffer size (%s)", + msg_Err( p_aout, "unable to set period size (%s)", snd_strerror( i_snd_rc ) ); goto error; } + p_aout->output.i_nb_samples = i_period_size; - /* Set period size. */ +/* Set buffer size. */ #ifdef HAVE_ALSA_NEW_API - if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, - p_hw, &i_period_size, NULL ) ) < 0 ) + if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, + p_hw, &i_buffer_size ) ) < 0 ) #else - if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, - p_hw, i_period_size, NULL ) ) < 0 ) + if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, + p_hw, i_buffer_size ) ) < 0 ) #endif { - msg_Err( p_aout, "unable to set period size (%s)", + msg_Err( p_aout, "unable to set buffer size (%s)", snd_strerror( i_snd_rc ) ); goto error; } - p_aout->output.i_nb_samples = i_period_size; /* Commit hardware parameters. */ if ( ( i_snd_rc = snd_pcm_hw_params( p_sys->p_snd_pcm, p_hw ) ) < 0 ) @@ -816,6 +816,10 @@ /* Here the device should be either in the RUNNING state. * p_status is valid. */ snd_pcm_sframes_t delay = snd_pcm_status_get_delay( p_status ); + if( delay == 0 )/* sometimes snd_pcm_status_get_delay() returns 0 */ + if( snd_pcm_delay( p_sys->p_snd_pcm, &delay ) < 0 ) + delay = 0; + int i_bytes = snd_pcm_frames_to_bytes( p_sys->p_snd_pcm, delay ); next_date = mdate() + ( (mtime_t)i_bytes * 1000000 / p_aout->output.output.i_bytes_per_frame diff -Nur --exclude po vlc-0.8.6d/modules/audio_output/Makefile.in vlc-0.8.6e/modules/audio_output/Makefile.in --- vlc-0.8.6d/modules/audio_output/Makefile.in 2007-11-28 06:23:14.000000000 +1100 +++ vlc-0.8.6e/modules/audio_output/Makefile.in 2008-02-25 06:07:20.000000000 +1100 @@ -439,6 +439,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -533,6 +534,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/codec/cmml/Makefile.in vlc-0.8.6e/modules/codec/cmml/Makefile.in --- vlc-0.8.6d/modules/codec/cmml/Makefile.in 2007-11-28 06:23:17.000000000 +1100 +++ vlc-0.8.6e/modules/codec/cmml/Makefile.in 2008-02-25 06:07:22.000000000 +1100 @@ -193,6 +193,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -287,6 +288,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/codec/dmo/dmo.c vlc-0.8.6e/modules/codec/dmo/dmo.c --- vlc-0.8.6d/modules/codec/dmo/dmo.c 2007-11-28 00:11:35.000000000 +1100 +++ vlc-0.8.6e/modules/codec/dmo/dmo.c 2007-12-13 10:12:28.000000000 +1100 @@ -2,7 +2,7 @@ * dmo.c : DirectMedia Object decoder module for vlc ***************************************************************************** * Copyright (C) 2002, 2003 the VideoLAN team - * $Id: dmo.c 23362 2007-11-26 19:34:14Z Trax $ + * $Id: dmo.c 23470 2007-12-06 00:59:36Z Trax $ * * Author: Gildas Bazin * @@ -1225,7 +1225,7 @@ if( i_selected < 0 ) { - msg_Err( p_enc, "couldn't find a matching ouput" ); + msg_Err( p_enc, "couldn't find a matching output" ); return VLC_EGENERIC; } diff -Nur --exclude po vlc-0.8.6d/modules/codec/dmo/Makefile.in vlc-0.8.6e/modules/codec/dmo/Makefile.in --- vlc-0.8.6d/modules/codec/dmo/Makefile.in 2007-11-28 06:23:18.000000000 +1100 +++ vlc-0.8.6e/modules/codec/dmo/Makefile.in 2008-02-25 06:07:22.000000000 +1100 @@ -175,6 +175,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -269,6 +270,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/codec/faad.c vlc-0.8.6e/modules/codec/faad.c --- vlc-0.8.6d/modules/codec/faad.c 2007-11-27 00:08:07.000000000 +1100 +++ vlc-0.8.6e/modules/codec/faad.c 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * decoder.c: AAC decoder using libfaad2 ***************************************************************************** * Copyright (C) 2001, 2003 the VideoLAN team - * $Id: faad.c 19601 2007-04-01 01:08:43Z hartman $ + * $Id: faad.c 25223 2008-02-21 08:51:03Z Trax $ * * Authors: Laurent Aimar * Gildas Bazin diff -Nur --exclude po vlc-0.8.6d/modules/codec/ffmpeg/Makefile.in vlc-0.8.6e/modules/codec/ffmpeg/Makefile.in --- vlc-0.8.6d/modules/codec/ffmpeg/Makefile.in 2007-11-28 06:23:19.000000000 +1100 +++ vlc-0.8.6e/modules/codec/ffmpeg/Makefile.in 2008-02-25 06:07:23.000000000 +1100 @@ -261,6 +261,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -355,6 +356,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/codec/ffmpeg/mux.c vlc-0.8.6e/modules/codec/ffmpeg/mux.c --- vlc-0.8.6d/modules/codec/ffmpeg/mux.c 2007-11-27 00:08:07.000000000 +1100 +++ vlc-0.8.6e/modules/codec/ffmpeg/mux.c 2007-12-30 02:25:53.000000000 +1100 @@ -2,7 +2,7 @@ * mux.c: muxer using ffmpeg (libavformat). ***************************************************************************** * Copyright (C) 2006 the VideoLAN team - * $Id: mux.c 16603 2006-09-10 20:40:21Z sam $ + * $Id: mux.c 23927 2007-12-29 12:17:38Z jpsaman $ * * Authors: Gildas Bazin * @@ -132,8 +132,11 @@ free( p_sys ); return VLC_EGENERIC; } - +#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) + p_sys->oc->pb = &p_sys->io; +#else p_sys->oc->pb = p_sys->io; +#endif p_sys->oc->nb_streams = 0; p_sys->b_write_header = VLC_TRUE; @@ -348,14 +351,19 @@ { msg_Dbg( p_mux, "writing header" ); - p_sys->b_write_header = VLC_FALSE; - if( av_write_header( p_sys->oc ) < 0 ) { msg_Err( p_mux, "could not write header" ); + p_sys->b_write_header = VLC_FALSE; p_sys->b_error = VLC_TRUE; return VLC_EGENERIC; } +#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) + put_flush_packet( p_sys->oc->pb ); +#else + put_flush_packet( &p_sys->oc->pb ); +#endif + p_sys->b_write_header = VLC_FALSE; } for( ;; ) diff -Nur --exclude po vlc-0.8.6d/modules/codec/ffmpeg/video_filter.c vlc-0.8.6e/modules/codec/ffmpeg/video_filter.c --- vlc-0.8.6d/modules/codec/ffmpeg/video_filter.c 2007-11-27 00:08:07.000000000 +1100 +++ vlc-0.8.6e/modules/codec/ffmpeg/video_filter.c 2008-02-25 06:01:53.000000000 +1100 @@ -3,7 +3,7 @@ * using the ffmpeg library ***************************************************************************** * Copyright (C) 1999-2001 the VideoLAN team - * $Id: video_filter.c 14796 2006-03-18 11:27:10Z zorglub $ + * $Id: video_filter.c 25091 2008-02-10 22:36:49Z jpsaman $ * * Authors: Gildas Bazin * @@ -130,7 +130,9 @@ p_filter->fmt_out.video.i_height ); if( CheckInit( p_filter ) != VLC_SUCCESS ) - { + { + if( p_sys->p_rsc ) img_resample_close( p_sys->p_rsc ); + avpicture_free( &p_sys->tmp_pic ); free( p_sys ); return VLC_EGENERIC; } @@ -173,7 +175,6 @@ filter_sys_t *p_sys = p_filter->p_sys; if( p_sys->p_rsc ) img_resample_close( p_sys->p_rsc ); - avpicture_free( &p_sys->tmp_pic ); free( p_sys ); diff -Nur --exclude po vlc-0.8.6d/modules/codec/Makefile.in vlc-0.8.6e/modules/codec/Makefile.in --- vlc-0.8.6d/modules/codec/Makefile.in 2007-11-28 06:23:17.000000000 +1100 +++ vlc-0.8.6e/modules/codec/Makefile.in 2008-02-25 06:07:22.000000000 +1100 @@ -847,6 +847,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -941,6 +942,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/codec/spudec/Makefile.in vlc-0.8.6e/modules/codec/spudec/Makefile.in --- vlc-0.8.6d/modules/codec/spudec/Makefile.in 2007-11-28 06:23:20.000000000 +1100 +++ vlc-0.8.6e/modules/codec/spudec/Makefile.in 2008-02-25 06:07:23.000000000 +1100 @@ -179,6 +179,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -273,6 +274,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/codec/x264.c vlc-0.8.6e/modules/codec/x264.c --- vlc-0.8.6d/modules/codec/x264.c 2007-11-27 00:08:07.000000000 +1100 +++ vlc-0.8.6e/modules/codec/x264.c 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * x264.c: h264 video encoder ***************************************************************************** * Copyright (C) 2004-2006 the VideoLAN team - * $Id: x264.c 17327 2006-10-28 18:06:45Z Trax $ + * $Id: x264.c 25153 2008-02-14 23:21:20Z Trax $ * * Authors: Laurent Aimar * @@ -469,7 +469,7 @@ change_string_list( direct_pred_list, direct_pred_list_text, 0 ); #if X264_BUILD >= 52 /* r573 */ - add_integer( SOUT_CFG_PREFIX "direct-8x8", 0, NULL, DIRECT_PRED_SIZE_TEXT, + add_integer( SOUT_CFG_PREFIX "direct-8x8", -1, NULL, DIRECT_PRED_SIZE_TEXT, DIRECT_PRED_SIZE_LONGTEXT, VLC_FALSE ); change_integer_range( -1, 1 ); #endif @@ -631,6 +631,9 @@ return VLC_EGENERIC; } + /* X264_POINTVER or X264_VERSION are not available */ + msg_Dbg ( p_enc, "version x264 0.%d.X", X264_BUILD ); + #if X264_BUILD < 37 if( p_enc->fmt_in.video.i_width % 16 != 0 || p_enc->fmt_in.video.i_height % 16 != 0 ) @@ -1054,12 +1057,13 @@ p_sys->param.cpu &= ~X264_CPU_SSE2; } + /* BUILD 29 adds support for multi-threaded encoding while BUILD 49 (r543) + also adds support for threads = 0 for automatically selecting an optimal + value (cores * 1.5) based on detected CPUs. Default behavior for x264 is + threads = 1, however VLC usage differs and uses threads = 0 (auto) by + default unless ofcourse transcode threads is explicitly specified.. */ #if X264_BUILD >= 29 - /* As of r543 x264 will autodetect the number of cpus and will set - the number of threads accordingly unless ofcourse the number of - threads is explicitly specified... */ - if( p_enc->i_threads >= 1 ) - p_sys->param.i_threads = p_enc->i_threads; + p_sys->param.i_threads = p_enc->i_threads; #endif /* Open the encoder */ diff -Nur --exclude po vlc-0.8.6d/modules/control/http/Makefile.in vlc-0.8.6e/modules/control/http/Makefile.in --- vlc-0.8.6d/modules/control/http/Makefile.in 2007-11-28 06:23:21.000000000 +1100 +++ vlc-0.8.6e/modules/control/http/Makefile.in 2008-02-25 06:07:24.000000000 +1100 @@ -185,6 +185,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -279,6 +280,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/control/Makefile.in vlc-0.8.6e/modules/control/Makefile.in --- vlc-0.8.6d/modules/control/Makefile.in 2007-11-28 06:23:20.000000000 +1100 +++ vlc-0.8.6e/modules/control/Makefile.in 2008-02-25 06:07:24.000000000 +1100 @@ -336,6 +336,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -430,6 +431,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/demux/asf/Makefile.in vlc-0.8.6e/modules/demux/asf/Makefile.in --- vlc-0.8.6d/modules/demux/asf/Makefile.in 2007-11-28 06:23:24.000000000 +1100 +++ vlc-0.8.6e/modules/demux/asf/Makefile.in 2008-02-25 06:07:27.000000000 +1100 @@ -179,6 +179,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -273,6 +274,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/demux/avi/Makefile.in vlc-0.8.6e/modules/demux/avi/Makefile.in --- vlc-0.8.6d/modules/demux/avi/Makefile.in 2007-11-28 06:23:25.000000000 +1100 +++ vlc-0.8.6e/modules/demux/avi/Makefile.in 2008-02-25 06:07:27.000000000 +1100 @@ -179,6 +179,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -273,6 +274,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/demux/live555.cpp vlc-0.8.6e/modules/demux/live555.cpp --- vlc-0.8.6d/modules/demux/live555.cpp 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/live555.cpp 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * live555.cpp : LIVE555 Streaming Media support. ***************************************************************************** * Copyright (C) 2003-2006 the VideoLAN team - * $Id: live555.cpp 23229 2007-11-21 22:11:12Z jpsaman $ + * $Id: live555.cpp 25258 2008-02-22 11:02:10Z thresh $ * * Authors: Laurent Aimar * @@ -28,10 +28,13 @@ #include #include +#include +#include #include "network.h" #include +#include #if defined( WIN32 ) # include @@ -161,6 +164,7 @@ { char *p_sdp; /* XXX mallocated */ char *psz_path; /* URL-encoded path */ + vlc_url_t url; MediaSession *ms; TaskScheduler *scheduler; @@ -277,6 +281,9 @@ p_sys->b_multicast = VLC_FALSE; p_sys->psz_path = strdup( p_demux->psz_path ); + /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */ + vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 ); + if( ( p_sys->scheduler = BasicTaskScheduler::createNew() ) == NULL ) { msg_Err( p_demux, "BasicTaskScheduler::createNew failed" ); @@ -301,16 +308,25 @@ int i_sdp_max = 1000; uint8_t *p_sdp = (uint8_t*) malloc( i_sdp_max ); + if( !p_sdp ) + goto error; + for( ;; ) { int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp], i_sdp_max - i_sdp - 1 ); + if( p_demux->b_die || p_demux->b_error ) + { + free( p_sdp ); + goto error; + } + if( i_read < 0 ) { msg_Err( p_demux, "failed to read SDP" ); - free( p_sys ); - return VLC_EGENERIC; + free( p_sdp ); + goto error; } i_sdp += i_read; @@ -351,7 +367,8 @@ goto error; } - if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS ) + i_return = SessionsSetup( p_demux ); + if( i_return != VLC_SUCCESS ) { msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); goto error; @@ -362,19 +379,31 @@ if( p_sys->i_length < 0 ) p_sys->i_length = -1; - if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS ) + i_return = Play( p_demux ); + if( i_return != VLC_SUCCESS ) goto error; - + /* Create all es struct */ iter = new MediaSubsessionIterator( *p_sys->ms ); while( ( sub = iter->next() ) != NULL ) { live_track_t *tk; + if( p_demux->b_die || p_demux->b_error ) + { + delete iter; + goto error; + } + /* Check if we will receive data from this subsession for this track */ if( sub->readSource() == NULL ) continue; tk = (live_track_t*)malloc( sizeof( live_track_t ) ); + if( !tk ) + { + delete iter; + goto error; + } tk->p_demux = p_demux; tk->waiting = 0; tk->i_pts = 0; @@ -387,6 +416,12 @@ tk->i_buffer = 65536; tk->p_buffer = (uint8_t *)malloc( 65536 ); + if( !tk->p_buffer ) + { + delete iter; + goto error; + } + /* Value taken from mplayer */ if( !strcmp( sub->mediumName(), "audio" ) ) { @@ -594,7 +629,7 @@ { tk->readSource = sub->readSource(); tk->rtpSource = sub->rtpSource(); - + /* Append */ p_sys->track = (live_track_t**)realloc( p_sys->track, sizeof( live_track_t ) * ( p_sys->i_track + 1 ) ); p_sys->track[p_sys->i_track++] = tk; @@ -637,6 +672,8 @@ if( p_sys->p_sdp ) free( p_sys->p_sdp ); if( p_sys->psz_path ) free( p_sys->psz_path ); + vlc_UrlClean( &p_sys->url ); + free( p_sys ); return VLC_EGENERIC; } @@ -683,6 +720,9 @@ if( p_sys->scheduler ) delete p_sys->scheduler; if( p_sys->p_sdp ) free( p_sys->p_sdp ); if( p_sys->psz_path ) free( p_sys->psz_path ); + + vlc_UrlClean( &p_sys->url ); + free( p_sys ); } @@ -693,6 +733,7 @@ { demux_sys_t *p_sys = p_demux->p_sys; Authenticator authenticator; + vlc_bool_t b_firsttime = VLC_TRUE; // HACK FOR LIVE555 char *psz_user = NULL; char *psz_pwd = NULL; @@ -702,20 +743,52 @@ int i_http_port = 0; int i_ret = VLC_SUCCESS; + psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 ); + if( !psz_url ) return VLC_ENOMEM; + + if( p_sys->url.psz_username || p_sys->url.psz_password ) + { + sprintf( psz_url, "rtsp://%s%s", p_sys->url.psz_host, + p_sys->url.psz_path ); + + psz_user = strdup( p_sys->url.psz_username ); + psz_pwd = strdup( p_sys->url.psz_password ); + } + else + { + sprintf( psz_url, "rtsp://%s", p_sys->psz_path ); + + psz_user = var_CreateGetString( p_demux, "rtsp-user" ); + psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); + } + createnew: + if( p_demux->b_die || p_demux->b_error ) + { + free( psz_user ); + free( psz_pwd ); + free( psz_url ); + return VLC_EGENERIC; + } + if( var_CreateGetBool( p_demux, "rtsp-http" ) ) i_http_port = var_CreateGetInteger( p_demux, "rtsp-http-port" ); #if LIVEMEDIA_LIBRARY_VERSION_INT > 1130457500 - if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1 /*verbose*/, + if( ( p_sys->rtsp = RTSPClient::createNew( *p_sys->env, + p_demux->p_libvlc->i_verbose > 1, "VLC media player", i_http_port ) ) == NULL ) #else - if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1 /*verbose*/, + if( ( p_sys->rtsp = RTSPClient::createNew( *p_sys->env, + p_demux->p_libvlc->i_verbose > 1, "VLC media player" ) ) == NULL ) #endif { msg_Err( p_demux, "RTSPClient::createNew failed (%s)", p_sys->env->getResultMsg() ); + free( psz_user ); + free( psz_pwd ); + free( psz_url ); return VLC_EGENERIC; } @@ -732,52 +805,87 @@ #endif } - psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 ); - sprintf( psz_url, "rtsp://%s", p_sys->psz_path ); +describe: + authenticator.setUsernameAndPassword( (const char*)psz_user, + (const char*)psz_pwd ); - psz_options = p_sys->rtsp->sendOptionsCmd( psz_url ); + psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd, + &authenticator ); if( psz_options ) delete [] psz_options; - psz_user = var_CreateGetString( p_demux, "rtsp-user" ); - psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); - - authenticator.setUsernameAndPassword( (const char*)psz_user, (const char*)psz_pwd ); - p_sdp = p_sys->rtsp->describeURL( psz_url, - &authenticator, var_CreateGetBool( p_demux, "rtsp-kasenna" ) ); - - if( psz_user ) free( psz_user ); - if( psz_pwd ) free( psz_pwd ); - + p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, + var_CreateGetBool( p_demux, "rtsp-kasenna" ) ); if( p_sdp == NULL ) { - /* failure occured */ - int i_code = 0; + /* failure occurred */ + uint32_t i_code = 0; const char *psz_error = p_sys->env->getResultMsg(); - msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error ); - sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code ); + if( var_GetBool( p_demux, "rtsp-http" ) ) + { + sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s", + &i_code ); + } + else + { + const char *psz_tmp = strstr( psz_error, "RTSP" ); + sscanf( psz_tmp, "RTSP/%*s%3u", &i_code ); + } + msg_Dbg( p_demux, "DESCRIBE failed with %d: [%s]", i_code, psz_error ); + + if( b_firsttime ) + { /* HACK FOR LIVE555 */ + i_code = 0; + b_firsttime = VLC_FALSE; + } if( i_code == 401 ) { - msg_Err( p_demux, "RTSP authentication failed" ); + int i_result; + msg_Dbg( p_demux, "authentication failed" ); + + if( psz_user ) free( psz_user ); + if( psz_pwd ) free( psz_pwd ); + psz_user = psz_pwd = NULL; + + i_result = intf_UserLoginPassword( p_demux, _("RTSP authentication"), + _("Please enter a valid login name and a password."), + &psz_user, &psz_pwd ); + if( i_result == DIALOG_OK_YES ) + { + msg_Dbg( p_demux, "retrying with user=%s, pwd=%s", + psz_user, psz_pwd ); + goto describe; + } } - else if( !var_CreateGetBool( p_demux, "rtsp-http" ) ) + else if( (i_code != 0) && !var_GetBool( p_demux, "rtsp-http" ) ) { /* Perhaps a firewall is being annoying. Try HTTP tunneling mode */ vlc_value_t val; val.b_bool = VLC_TRUE; msg_Dbg( p_demux, "we will now try HTTP tunneling mode" ); var_Set( p_demux, "rtsp-http", val ); - if( psz_url ) free( psz_url ); if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); + p_sys->rtsp = NULL; + goto createnew; + } + else + { + msg_Dbg( p_demux, "connection timeout, retrying" ); + if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); + p_sys->rtsp = NULL; goto createnew; } i_ret = VLC_EGENERIC; } - if( psz_url ) free( psz_url ); /* malloc-ated copy */ + if( psz_url ) free( psz_url ); + if( psz_user ) free( psz_user ); + if( psz_pwd ) free( psz_pwd ); + if( p_sys->p_sdp ) free( p_sys->p_sdp ); + p_sys->p_sdp = NULL; if( p_sdp ) p_sys->p_sdp = strdup( (char*)p_sdp ); delete[] p_sdp; @@ -800,7 +908,8 @@ unsigned int i_buffer = 0; unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */ - b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ); + b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ) || + var_GetBool( p_demux, "rtsp-http" ); i_client_port = var_CreateGetInteger( p_demux, "rtp-client-port" ); /* Initialise each media subsession */ @@ -909,7 +1018,13 @@ #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1138089600 p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter(); #endif - if( p_sys->i_timeout > 0 && !p_sys->p_timeout ) + if( p_sys->i_timeout <= 0 ) + p_sys->i_timeout = 60; /* default value from RFC2326 */ + + /* start timeout-thread only on x-asf streams (wms), it has rtcp support but doesn't + * seem to use it for liveness/keep-alive, get_parameter seems to work for it. get_parameter + * doesn't work with dss 5.5.4 & 5.5.5, they seems to work with rtcp */ + if( !p_sys->p_timeout && p_sys->p_out_asf ) { msg_Dbg( p_demux, "We have a timeout of %d seconds", p_sys->i_timeout ); p_sys->p_timeout = (timeout_thread_t *)vlc_object_create( p_demux, sizeof(timeout_thread_t) ); @@ -1057,7 +1172,8 @@ } else if( !p_sys->b_multicast && p_sys->b_no_data && p_sys->i_no_data_ti > 34 ) { - vlc_bool_t b_rtsp_tcp = var_GetBool( p_demux, "rtsp-tcp" ); + vlc_bool_t b_rtsp_tcp = var_GetBool( p_demux, "rtsp-tcp" ) || + var_GetBool( p_demux, "rtsp-http" ); if( !b_rtsp_tcp && p_sys->rtsp && p_sys->ms ) { @@ -1227,10 +1343,12 @@ MediaSubsessionIterator *iter = 0; MediaSubsession *sub; int i_tk; - int i_return; + int i_return = VLC_SUCCESS; var_SetBool( p_demux, "rtsp-tcp", VLC_TRUE ); + if( p_sys->p_out_asf ) stream_DemuxDelete( p_sys->p_out_asf ); + /* We close the old RTSP session */ p_sys->rtsp->teardownMediaSession( *p_sys->ms ); @@ -1239,9 +1357,11 @@ p_sys->ms = NULL; p_sys->rtsp = NULL; + p_sys->p_out_asf = NULL; /* Reopen rtsp client */ - if( ( i_return = Connect( p_demux ) ) != VLC_SUCCESS ) + i_return = Connect( p_demux ); + if( i_return != VLC_SUCCESS ) { msg_Err( p_demux, "Failed to connect with rtsp://%s", p_sys->psz_path ); goto error; @@ -1261,7 +1381,8 @@ goto error; } - if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS ) + i_return = SessionsSetup( p_demux ); + if( i_return != VLC_SUCCESS ) { msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); goto error; @@ -1272,7 +1393,8 @@ if( p_sys->i_length < 0 ) p_sys->i_length = -1; - if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS ) + i_return = Play( p_demux ); + if( i_return != VLC_SUCCESS ) goto error; /* Update all tracks */ @@ -1357,15 +1479,17 @@ uint8_t *endpos = (uint8_t*)qtRTPSource->qtState.sdAtom + qtRTPSource->qtState.sdAtomSize; while (pos+8 < endpos) { - unsigned atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3]; - if( atomLength == 0 || atomLength > endpos-pos) break; + unsigned int atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3]; + if( (atomLength == 0) || (atomLength > (unsigned int)(endpos-pos))) break; if( memcmp(pos+4, "avcC", 4) == 0 && atomLength > 8 && atomLength <= INT_MAX) { tk->fmt.i_extra = atomLength-8; tk->fmt.p_extra = malloc( tk->fmt.i_extra ); - memcpy(tk->fmt.p_extra, pos+8, atomLength-8); + if( !tk->fmt.p_extra ) + tk->fmt.i_extra = 0; + else memcpy(tk->fmt.p_extra, pos+8, atomLength-8); break; } pos += atomLength; @@ -1375,7 +1499,9 @@ { tk->fmt.i_extra = qtState.sdAtomSize - 16; tk->fmt.p_extra = malloc( tk->fmt.i_extra ); - memcpy( tk->fmt.p_extra, &sdAtom[12], tk->fmt.i_extra ); + if( !tk->fmt.p_extra ) + tk->fmt.i_extra = 0; + else memcpy( tk->fmt.p_extra, &sdAtom[12], tk->fmt.i_extra ); } tk->p_es = es_out_Add( p_demux->out, &tk->fmt ); } diff -Nur --exclude po vlc-0.8.6d/modules/demux/Makefile.in vlc-0.8.6e/modules/demux/Makefile.in --- vlc-0.8.6d/modules/demux/Makefile.in 2007-11-28 06:23:24.000000000 +1100 +++ vlc-0.8.6e/modules/demux/Makefile.in 2008-02-25 06:07:26.000000000 +1100 @@ -816,6 +816,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -910,6 +911,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/demux/mkv.cpp vlc-0.8.6e/modules/demux/mkv.cpp --- vlc-0.8.6d/modules/demux/mkv.cpp 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/mkv.cpp 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * mkv.cpp : matroska demuxer ***************************************************************************** * Copyright (C) 2003-2004 the VideoLAN team - * $Id: mkv.cpp 20529 2007-06-12 16:31:11Z Trax $ + * $Id: mkv.cpp 25227 2008-02-21 09:16:00Z Trax $ * * Authors: Laurent Aimar * Steve Lhomme @@ -1519,8 +1519,16 @@ #endif { // test wether this file belongs to our family + uint8_t *p_peek; + bool file_ok = false; stream_t *p_file_stream = stream_UrlNew( p_demux, s_filename.c_str()); - if ( p_file_stream != NULL ) + /* peek the begining */ + if( p_file_stream && + stream_Peek( p_file_stream, &p_peek, 4 ) >= 4 + && p_peek[0] == 0x1a && p_peek[1] == 0x45 && + p_peek[2] == 0xdf && p_peek[3] == 0xa3 ) file_ok = true; + + if ( file_ok ) { vlc_stream_io_callback *p_file_io = new vlc_stream_io_callback( p_file_stream, VLC_TRUE ); EbmlStream *p_estream = new EbmlStream(*p_file_io); @@ -1542,6 +1550,9 @@ } else { + if( p_file_stream ) { + stream_Delete( p_file_stream ); + } msg_Dbg( p_demux, "the file '%s' cannot be opened", s_filename.c_str() ); } } diff -Nur --exclude po vlc-0.8.6d/modules/demux/mp4/libmp4.c vlc-0.8.6e/modules/demux/mp4/libmp4.c --- vlc-0.8.6d/modules/demux/mp4/libmp4.c 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/mp4/libmp4.c 2007-12-28 22:05:28.000000000 +1100 @@ -2,7 +2,7 @@ * libmp4.c : LibMP4 library for mp4 module for vlc ***************************************************************************** * Copyright (C) 2001-2004 the VideoLAN team - * $Id: libmp4.c 19605 2007-04-01 01:23:18Z hartman $ + * $Id: libmp4.c 23859 2007-12-24 19:06:04Z Trax $ * * Author: Laurent Aimar * @@ -2147,14 +2147,14 @@ return MP4_ReadBox_sample_tx3g( p_stream, p_box ); default: msg_Warn( p_stream, - "unknown handler type in stsd (uncompletetly loaded)" ); + "unknown handler type in stsd (incompletely loaded)" ); return 1; } } unknown: msg_Warn( p_stream, - "unknown box type %4.4s (uncompletetly loaded)", + "unknown box type %4.4s (incompletely loaded)", (char*)&p_box->i_type ); return 1; diff -Nur --exclude po vlc-0.8.6d/modules/demux/mp4/Makefile.in vlc-0.8.6e/modules/demux/mp4/Makefile.in --- vlc-0.8.6d/modules/demux/mp4/Makefile.in 2007-11-28 06:23:25.000000000 +1100 +++ vlc-0.8.6e/modules/demux/mp4/Makefile.in 2008-02-25 06:07:27.000000000 +1100 @@ -180,6 +180,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -274,6 +275,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/demux/mp4/mp4.c vlc-0.8.6e/modules/demux/mp4/mp4.c --- vlc-0.8.6d/modules/demux/mp4/mp4.c 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/mp4/mp4.c 2008-02-25 06:01:52.000000000 +1100 @@ -2,7 +2,7 @@ * mp4.c : MP4 file input module for vlc ***************************************************************************** * Copyright (C) 2001-2004 the VideoLAN team - * $Id: mp4.c 18118 2006-11-27 21:27:38Z hartman $ + * $Id: mp4.c 25158 2008-02-15 17:16:03Z courmisch $ * Authors: Laurent Aimar * * This program is free software; you can redistribute it and/or modify @@ -468,12 +468,14 @@ msg_Err( p_demux, "cannot find any /moov/trak" ); goto error; } - msg_Dbg( p_demux, "find %d track%c", + msg_Dbg( p_demux, "found %d track%c", p_sys->i_tracks, p_sys->i_tracks ? 's':' ' ); /* allocate memory */ p_sys->track = calloc( p_sys->i_tracks, sizeof( mp4_track_t ) ); + if( p_sys->track == NULL ) + goto error; memset( p_sys->track, 0, p_sys->i_tracks * sizeof( mp4_track_t ) ); /* now process each track and extract all usefull information */ @@ -922,6 +924,10 @@ } p_demux_track->chunk = calloc( p_demux_track->i_chunk_count, sizeof( mp4_chunk_t ) ); + if( p_demux_track->chunk == NULL ) + { + return VLC_ENOMEM; + } /* first we read chunk offset */ for( i_chunk = 0; i_chunk < p_demux_track->i_chunk_count; i_chunk++ ) @@ -953,6 +959,12 @@ for( i_chunk = p_stsc->data.p_stsc->i_first_chunk[i_index] - 1; i_chunk < i_last; i_chunk++ ) { + if( i_chunk >= p_demux_track->i_chunk_count ) + { + msg_Warn( p_demux, "corrupted chunk table" ); + return VLC_EGENERIC; + } + p_demux_track->chunk[i_chunk].i_sample_description_index = p_stsc->data.p_stsc->i_sample_description_index[i_index]; p_demux_track->chunk[i_chunk].i_sample_count = @@ -1028,6 +1040,8 @@ p_demux_track->i_sample_size = 0; p_demux_track->p_sample_size = calloc( p_demux_track->i_sample_count, sizeof( uint32_t ) ); + if( p_demux_track->p_sample_size == NULL ) + return VLC_ENOMEM; for( i_sample = 0; i_sample < p_demux_track->i_sample_count; i_sample++ ) { diff -Nur --exclude po vlc-0.8.6d/modules/demux/mpeg/Makefile.in vlc-0.8.6e/modules/demux/mpeg/Makefile.in --- vlc-0.8.6d/modules/demux/mpeg/Makefile.in 2007-11-28 06:23:26.000000000 +1100 +++ vlc-0.8.6e/modules/demux/mpeg/Makefile.in 2008-02-25 06:07:28.000000000 +1100 @@ -262,6 +262,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -356,6 +357,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/demux/ogg.c vlc-0.8.6e/modules/demux/ogg.c --- vlc-0.8.6d/modules/demux/ogg.c 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/ogg.c 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * ogg.c : ogg stream demux module for vlc ***************************************************************************** * Copyright (C) 2001-2003 the VideoLAN team - * $Id: ogg.c 16441 2006-08-30 21:36:35Z hartman $ + * $Id: ogg.c 25224 2008-02-21 08:58:15Z Trax $ * * Authors: Gildas Bazin * Andre Pang (Annodex support) @@ -277,14 +277,14 @@ { if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') && oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[1], "theora", 6 ) ) + ! memcmp( oggpacket.packet, "\x80theora", 7 ) ) { Ogg_ReadTheoraHeader( p_stream, &oggpacket ); p_stream->secondary_header_packets = 0; } else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') && oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) + ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) ) { Ogg_ReadVorbisHeader( p_stream, &oggpacket ); p_stream->secondary_header_packets = 0; @@ -485,13 +485,13 @@ } if( p_oggpacket->bytes >= 7 && - ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) ) + ! memcmp ( p_oggpacket->packet, "Annodex", 7 ) ) { /* it's an Annodex packet -- skip it (do nothing) */ return; } else if( p_oggpacket->bytes >= 7 && - ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) ) + ! memcmp ( p_oggpacket->packet, "AnxData", 7 ) ) { /* it's an AnxData packet -- skip it (do nothing) */ return; @@ -691,7 +691,7 @@ } i_header_len++; - if( p_block->i_buffer >= i_header_len ) + if( p_block->i_buffer >= (unsigned int)i_header_len ) p_block->i_buffer -= i_header_len; else p_block->i_buffer = 0; @@ -770,14 +770,14 @@ /* Check for Vorbis header */ if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) ) + ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) ) { Ogg_ReadVorbisHeader( p_stream, &oggpacket ); msg_Dbg( p_demux, "found vorbis header" ); } /* Check for Speex header */ - else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[0], "Speex", 5 ) ) + else if( oggpacket.bytes >= 5 && + ! memcmp( oggpacket.packet, "Speex", 5 ) ) { Ogg_ReadSpeexHeader( p_stream, &oggpacket ); msg_Dbg( p_demux, "found speex header, channels: %i, " @@ -787,7 +787,7 @@ } /* Check for Flac header (< version 1.1.1) */ else if( oggpacket.bytes >= 4 && - ! memcmp( &oggpacket.packet[0], "fLaC", 4 ) ) + ! memcmp( oggpacket.packet, "fLaC", 4 ) ) { msg_Dbg( p_demux, "found FLAC header" ); @@ -820,7 +820,7 @@ } /* Check for Theora header */ else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[1], "theora", 6 ) ) + ! memcmp( oggpacket.packet, "\x80theora", 7 ) ) { Ogg_ReadTheoraHeader( p_stream, &oggpacket ); @@ -850,7 +850,7 @@ } /* Check for Annodex header */ else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) ) + ! memcmp( oggpacket.packet, "Annodex", 7 ) ) { Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, &oggpacket ); @@ -860,7 +860,7 @@ } /* Check for Annodex header */ else if( oggpacket.bytes >= 7 && - ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) ) + ! memcmp( oggpacket.packet, "AnxData", 7 ) ) { Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream, &oggpacket ); @@ -1080,6 +1080,15 @@ p_ogg->i_streams--; } } + else if( oggpacket.bytes >= 7 && + ! memcmp( oggpacket.packet, "fishead", 7 ) ) + + { + /* Skeleton */ + msg_Dbg( p_demux, "stream %d is a skeleton", + p_ogg->i_streams-1 ); + /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */ + } else { msg_Dbg( p_demux, "stream %d is of unknown type", @@ -1325,7 +1334,7 @@ ogg_packet *p_oggpacket ) { if( p_oggpacket->bytes >= 28 && - !memcmp( &p_oggpacket->packet[0], "Annodex", 7 ) ) + !memcmp( p_oggpacket->packet, "Annodex", 7 ) ) { oggpack_buffer opb; @@ -1344,7 +1353,7 @@ timebase_denominator = GetQWLE( &p_oggpacket->packet[24] ); } else if( p_oggpacket->bytes >= 42 && - !memcmp( &p_oggpacket->packet[0], "AnxData", 7 ) ) + !memcmp( p_oggpacket->packet, "AnxData", 7 ) ) { uint64_t granule_rate_numerator; uint64_t granule_rate_denominator; diff -Nur --exclude po vlc-0.8.6d/modules/demux/playlist/m3u.c vlc-0.8.6e/modules/demux/playlist/m3u.c --- vlc-0.8.6d/modules/demux/playlist/m3u.c 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/playlist/m3u.c 2007-12-13 10:12:28.000000000 +1100 @@ -2,7 +2,7 @@ * m3u.c : M3U playlist format import ***************************************************************************** * Copyright (C) 2004 the VideoLAN team - * $Id: m3u.c 23303 2007-11-24 19:15:12Z dionoea $ + * $Id: m3u.c 23505 2007-12-09 00:59:20Z Trax $ * * Authors: Clément Stenac * Sigmund Augdal Helberg @@ -207,7 +207,7 @@ } else { - msg_Err( p_demux, "m3u EXTVLCOPT parsing is disabled for security reasons. If you need it and trust the m3u playlist you are trying to open, please append --m3u-extvlcopt to you command line." ); + msg_Err( p_demux, "m3u EXTVLCOPT parsing is disabled for security reasons. If you need it and trust the m3u playlist you are trying to open, please append --m3u-extvlcopt to your command line." ); } } } diff -Nur --exclude po vlc-0.8.6d/modules/demux/playlist/Makefile.in vlc-0.8.6e/modules/demux/playlist/Makefile.in --- vlc-0.8.6d/modules/demux/playlist/Makefile.in 2007-11-28 06:23:26.000000000 +1100 +++ vlc-0.8.6e/modules/demux/playlist/Makefile.in 2008-02-25 06:07:28.000000000 +1100 @@ -202,6 +202,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -296,6 +297,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/demux/subtitle.c vlc-0.8.6e/modules/demux/subtitle.c --- vlc-0.8.6d/modules/demux/subtitle.c 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/subtitle.c 2007-12-28 22:05:28.000000000 +1100 @@ -2,7 +2,7 @@ * subtitle.c: Demux for subtitle text files. ***************************************************************************** * Copyright (C) 1999-2004 the VideoLAN team - * $Id: subtitle.c 18177 2006-11-30 20:42:25Z hartman $ + * $Id: subtitle.c 23855 2007-12-24 16:42:08Z courmisch $ * * Authors: Laurent Aimar * Derk-Jan Hartman @@ -723,8 +723,8 @@ i_stop = 0; memset( buffer_text, '\0', MAX_LINE ); - if( sscanf( s, "{%d}{}%[^\r\n]", &i_start, buffer_text ) == 2 || - sscanf( s, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) + if( sscanf( s, "{%d}{}%8192[^\r\n]", &i_start, buffer_text ) == 2 || + sscanf( s, "{%d}{%d}%8192[^\r\n]", &i_start, &i_stop, buffer_text ) == 3) { break; } @@ -949,8 +949,8 @@ demux_sys_t *p_sys = p_demux->p_sys; text_t *txt = &p_sys->txt; - char buffer_text[ 10 * MAX_LINE]; - char buffer_text2[ 10 * MAX_LINE]; + char buffer_text[ 10 * MAX_LINE + 1]; + char buffer_text2[ 10 * MAX_LINE + 1]; char *s; int64_t i_start; int64_t i_stop; @@ -981,7 +981,7 @@ * Dialogue: Layer#,0:02:40.65,0:02:41.79,Wolf main,Cher,0000,0000,0000,,Et les enregistrements de ses ondes delta ? */ if( sscanf( s, - "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%[^\r\n]", + "Dialogue: %[^,],%d:%d:%d.%d,%d:%d:%d.%d,%81920[^\r\n]", buffer_text2, &h1, &m1, &s1, &c1, &h2, &m2, &s2, &c2, @@ -1075,7 +1075,7 @@ i_start = 0; memset( buffer_text, '\0', MAX_LINE ); - if( sscanf( p, "%d:%d:%d%[ :]%[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) + if( sscanf( p, "%d:%d:%d%[ :]%81920[^\r\n]", &h, &m, &s, &c, buffer_text ) == 5 ) { i_start = ( (int64_t)h * 3600*1000 + (int64_t)m * 60*1000 + diff -Nur --exclude po vlc-0.8.6d/modules/demux/ts.c vlc-0.8.6e/modules/demux/ts.c --- vlc-0.8.6d/modules/demux/ts.c 2007-11-27 00:08:01.000000000 +1100 +++ vlc-0.8.6e/modules/demux/ts.c 2008-01-20 00:59:11.000000000 +1100 @@ -2,7 +2,7 @@ * ts.c: Transport Stream input module for VLC. ***************************************************************************** * Copyright (C) 2004-2005 VideoLAN (Centrale Réseaux) and its contributors - * $Id: ts.c 19719 2007-04-06 18:03:48Z massiot $ + * $Id: ts.c 24387 2008-01-18 13:26:53Z Trax $ * * Authors: Laurent Aimar * Jean-Paul Saman @@ -67,7 +67,9 @@ # include "tables/eit.h" # endif #endif - +#ifdef HAVE_TIME_H +# include +#endif #undef TS_DEBUG /* TODO: @@ -135,13 +137,14 @@ add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE ); add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE ); add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE ); - add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT, + add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT, MTUOUT_LONGTEXT, VLC_TRUE ); add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE ); add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE ); add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE ); add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE ); + add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, VLC_FALSE ); add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, DUMPSIZE_LONGTEXT, VLC_TRUE ); @@ -324,6 +327,8 @@ vlc_bool_t b_dvb_control; int i_dvb_program; + int64_t i_dvb_start; + int64_t i_dvb_length; vlc_list_t *p_programs_list; /* TS dump */ @@ -377,12 +382,12 @@ demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - uint8_t *p_peek; + uint8_t *p_peek; int i_sync, i_peek, i; int i_packet_size; ts_pid_t *pat; - char *psz_mode; + const char *psz_mode; vlc_bool_t b_append; vlc_bool_t b_topfield = VLC_FALSE; @@ -391,8 +396,7 @@ if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) < TS_PACKET_SIZE_MAX ) return VLC_EGENERIC; - if( p_peek[0] == 'T' && p_peek[1] == 'F' && - p_peek[2] == 'r' && p_peek[3] == 'c' ) + if( memcmp( p_peek, "TFrc", 4 ) == 0 ) { b_topfield = VLC_TRUE; msg_Dbg( p_demux, "this is a topfield file" ); @@ -405,7 +409,8 @@ } if( i_sync >= TS_PACKET_SIZE_MAX && !b_topfield ) { - if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC; + if( !p_demux->b_force ) + return VLC_EGENERIC; msg_Warn( p_demux, "this does not look like a TS stream, continuing" ); } @@ -419,7 +424,7 @@ /* Check next 3 sync bytes */ i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1; } - + if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek ) { msg_Err( p_demux, "cannot peek" ); @@ -443,7 +448,7 @@ { i_packet_size = TS_PACKET_SIZE_204; } - else if( !strcmp( p_demux->psz_demux, "ts" ) ) + else if( p_demux->b_force ) { i_packet_size = TS_PACKET_SIZE_188; } @@ -451,7 +456,7 @@ { i_packet_size = TS_PACKET_SIZE_188; #if 0 - /* I used the TF5000PVR 2004 Firmware .doc header documentation, + /* I used the TF5000PVR 2004 Firmware .doc header documentation, * http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc * but after the filename the offsets seem to be incorrect. - DJ */ int i_duration, i_name; @@ -482,7 +487,7 @@ // 4 bytes of freq. Uimsbf (56,57,58,59) // 2 bytes of symbol rate Uimsbf (60,61) // 2 bytes of TS stream ID Uimsbf (62,63) - // 4 bytes reserved + // 4 bytes reserved // 2 bytes reserved // 2 bytes duration Uimsbf (70,71) //i_duration = (int) (p_peek[70] << 8) | p_peek[71]; @@ -521,6 +526,8 @@ } p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; memset( p_sys, 0, sizeof( demux_sys_t ) ); p_sys->i_packet_size = i_packet_size; @@ -583,6 +590,9 @@ p_sys->b_meta = VLC_TRUE; p_sys->b_dvb_control = VLC_TRUE; p_sys->i_dvb_program = 0; + p_sys->i_dvb_start = 0; + p_sys->i_dvb_length = 0; + for( i = 0; i < 8192; i++ ) { ts_pid_t *pid = &p_sys->pid[i]; @@ -619,10 +629,11 @@ p_demux ); if( p_sys->b_dvb_control ) { - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x11, VLC_TRUE ); - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x12, VLC_TRUE ); + if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, 0x11, VLC_TRUE ) || + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, 0x12, VLC_TRUE ) ) + p_sys->b_dvb_control = VLC_FALSE; } } #endif @@ -654,7 +665,7 @@ if( i_port <= 0 ) i_port = 1234; msg_Dbg( p_demux, "resend ts to '%s:%d'", val.psz_string, i_port ); - p_sys->fd = net_ConnectUDP( p_demux, val.psz_string, i_port, 0 ); + p_sys->fd = net_ConnectUDP( VLC_OBJECT(p_demux), val.psz_string, i_port, 0 ); if( p_sys->fd < 0 ) { msg_Err( p_demux, "failed to open udp socket, send disabled" ); @@ -689,16 +700,26 @@ if( i_pid >= 2 && i_pid < 8192 ) { ts_pid_t *pmt = &p_sys->pid[i_pid]; + ts_prg_psi_t *prg; msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid ); PIDInit( pmt, VLC_TRUE, NULL ); - pmt->psi->i_prg = 1; - pmt->psi->prg = malloc( sizeof(ts_prg_psi_t) ); - /* FIXME we should also ask for a number */ - pmt->psi->prg[0]->handle = - dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, - p_demux ); - pmt->psi->prg[0]->i_number = 0; /* special one */ + + /* Dummy PMT */ + prg = malloc( sizeof( ts_prg_psi_t ) ); + if( !prg ) + { + msg_Err( p_demux, "out of memory" ); + Close( VLC_OBJECT(p_demux) ); + return VLC_ENOMEM; + } + + memset( prg, 0, sizeof( ts_prg_psi_t ) ); + prg->i_pid_pcr = -1; + prg->i_pid_pmt = -1; + prg->i_number = 0; /* special */ + prg->handle = dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux ); + TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg ); psz = strchr( psz, '=' ) + 1; /* can't failed */ while( psz && *psz ) @@ -862,7 +883,9 @@ if( p_sys->b_dvb_control && pid->i_pid > 0 ) { /* too much */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, VLC_FALSE ); + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, + VLC_FALSE ); } } @@ -889,8 +912,8 @@ /* If in dump mode, then close the file */ if( p_sys->b_file_out ) { - msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", p_sys->psz_file, - p_sys->i_write / 1024 ); + msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", + p_sys->psz_file, p_sys->i_write / 1024 ); if( p_sys->p_file != stdout ) { @@ -1152,6 +1175,32 @@ /***************************************************************************** * Control: *****************************************************************************/ +static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_length ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + if( pi_length ) + *pi_length = 0; + if( pi_time ) + *pi_time = 0; + +#ifdef HAVE_TIME_H + if( p_sys->b_dvb_control && p_sys->i_dvb_length > 0 ) + { + /* FIXME we should not use time() but read the date from the tdt */ + const time_t t = time( NULL ); + if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length ) + { + if( pi_length ) + *pi_length = p_sys->i_dvb_length * I64C(1000000); + if( pi_time ) + *pi_time = (t - p_sys->i_dvb_start) * I64C(1000000); + return VLC_SUCCESS; + } + } +#endif + return VLC_EGENERIC; +} + static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -1174,7 +1223,11 @@ } else { - *pf = 0.0; + int64_t i_time, i_length; + if( !DVBEventInformation( p_demux, &i_time, &i_length ) && i_length > 0 ) + *pf = (double)i_time/(double)i_length; + else + *pf = 0.0; } return VLC_SUCCESS; case DEMUX_SET_POSITION: @@ -1211,9 +1264,15 @@ return VLC_EGENERIC; #else case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( DVBEventInformation( p_demux, pi64, NULL ) ) + *pi64 = 0; + return VLC_SUCCESS; + case DEMUX_GET_LENGTH: pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = 0; + if( DVBEventInformation( p_demux, NULL, pi64 ) ) + *pi64 = 0; return VLC_SUCCESS; #endif case DEMUX_SET_GROUP: @@ -1358,8 +1417,7 @@ pid->p_owner = p_owner; pid->i_owner_number = 0; - pid->extra_es = NULL; - pid->i_extra_es = 0; + TAB_INIT( pid->i_extra_es, pid->extra_es ); if( b_psi ) { @@ -1367,40 +1425,49 @@ if( !b_old_valid ) { + free( pid->psi ); pid->psi = malloc( sizeof( ts_psi_t ) ); - pid->psi->handle= NULL; - pid->psi->i_prg = 0; - pid->psi->prg = NULL; + if( pid->psi ) + { + pid->psi->handle= NULL; + pid->psi->i_prg = 0; + pid->psi->prg = NULL; + } } pid->psi->i_pat_version = -1; pid->psi->i_sdt_version = -1; if( p_owner ) { ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) ); - /* PMT */ - prg->i_version = -1; - prg->i_number = -1; - prg->i_pid_pcr = -1; - prg->i_pid_pmt = -1; - prg->iod = NULL; - prg->handle = NULL; + if( prg ) + { + /* PMT */ + prg->i_version = -1; + prg->i_number = -1; + prg->i_pid_pcr = -1; + prg->i_pid_pmt = -1; + prg->iod = NULL; + prg->handle = NULL; - TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg ); + TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg ); + } } } else { pid->psi = NULL; pid->es = malloc( sizeof( ts_es_t ) ); - - es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 ); - pid->es->id = NULL; - pid->es->p_pes = NULL; - pid->es->i_pes_size= 0; - pid->es->i_pes_gathered= 0; - pid->es->pp_last = &pid->es->p_pes; - pid->es->p_mpeg4desc = NULL; - pid->es->b_gather = VLC_FALSE; + if( pid->es ) + { + es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 ); + pid->es->id = NULL; + pid->es->p_pes = NULL; + pid->es->i_pes_size= 0; + pid->es->i_pes_gathered= 0; + pid->es->pp_last = &pid->es->p_pes; + pid->es->p_mpeg4desc = NULL; + pid->es->b_gather = VLC_FALSE; + } } } @@ -1461,8 +1528,8 @@ { block_t *p_pes = pid->es->p_pes; uint8_t header[30]; - int i_pes_size = 0; - int i_skip = 0; + uint32_t i_pes_size = 0; + uint32_t i_skip = 0; mtime_t i_dts = -1; mtime_t i_pts = -1; mtime_t i_length = 0; @@ -1593,14 +1660,14 @@ ( dcd->p_decoder_specific_info[1]&0x10 ) ) { /* display length */ - if( p_pes->i_buffer + 2 <= i_skip ) + if( (uint32_t)(p_pes->i_buffer + 2) <= i_skip ) { i_length = GetWBE( &p_pes->p_buffer[i_skip] ); } i_skip += 2; } - if( p_pes->i_buffer + 2 <= i_skip ) + if( (uint32_t)(p_pes->i_buffer + 2) <= i_skip ) { i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] ); } @@ -1611,7 +1678,7 @@ /* skip header */ while( p_pes && i_skip > 0 ) { - if( p_pes->i_buffer <= i_skip ) + if( (uint32_t)p_pes->i_buffer <= i_skip ) { block_t *p_next = p_pes->p_next; @@ -1649,7 +1716,7 @@ p_block = block_ChainGather( p_pes ); if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) ) { - if( i_pes_size > 0 && p_block->i_buffer > i_pes_size ) + if( (i_pes_size > 0) && ((uint32_t)p_block->i_buffer > (uint32_t)i_pes_size) ) { p_block->i_buffer = i_pes_size; } @@ -1714,7 +1781,7 @@ const vlc_bool_t b_adaptation = p[3]&0x20; const vlc_bool_t b_payload = p[3]&0x10; const int i_cc = p[3]&0x0f; /* continuity counter */ - vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */ + vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */ /* transport_scrambling_control is ignored */ int i_skip = 0; @@ -1927,6 +1994,7 @@ case 0x06: /* PES_PRIVATE (fixed later) */ case 0x12: /* MPEG-4 generic (sub/scene/...) (fixed later) */ + case 0xEA: /* Privately managed ES (VC-1) (fixed later */ default: es_format_Init( fmt, UNKNOWN_ES, 0 ); break; @@ -1956,6 +2024,7 @@ return( i_len ); } + static int IODGetByte( int *pi_data, uint8_t **pp_data ) { if( *pi_data > 0 ) @@ -1967,12 +2036,14 @@ } return( 0 ); } + static int IODGetWord( int *pi_data, uint8_t **pp_data ) { const int i1 = IODGetByte( pi_data, pp_data ); const int i2 = IODGetByte( pi_data, pp_data ); return( ( i1 << 8 ) | i2 ); } + static int IODGet3Bytes( int *pi_data, uint8_t **pp_data ) { const int i1 = IODGetByte( pi_data, pp_data ); @@ -1996,6 +2067,7 @@ i_url_len = IODGetByte( pi_data, pp_data ); url = malloc( i_url_len + 1 ); + if( !url ) return NULL; for( i = 0; i < i_url_len; i++ ) { url[i] = IODGetByte( pi_data, pp_data ); @@ -2014,6 +2086,7 @@ int i_iod_length; p_iod = malloc( sizeof( iod_descriptor_t ) ); + if( !p_iod ) return NULL; memset( p_iod, 0, sizeof( iod_descriptor_t ) ); #ifdef TS_DEBUG @@ -2389,7 +2462,7 @@ for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next ) { - vlc_meta_t *p_meta = vlc_meta_New(); + vlc_meta_t *p_meta; dvbpsi_descriptor_t *p_dr; msg_Dbg( p_demux, " * service id=%d eit schedule=%d present=%d " @@ -2398,11 +2471,15 @@ p_srv->b_eit_present, p_srv->i_running_status, p_srv->b_free_ca ); + if( p_sys->i_dvb_program != -1 && p_sys->i_dvb_program != p_srv->i_service_id ) + continue; + + p_meta = vlc_meta_New(); for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next ) { if( p_dr->i_tag == 0x48 ) { - static const char *psz_type[0x11] = { + static const char *ppsz_type[17] = { "Reserved", "Digital television service", "Digital radio sound service", @@ -2432,12 +2509,12 @@ str2[pD->i_service_name_length] = '\0'; msg_Dbg( p_demux, " - type=%d provider=%s name=%s", - pD->i_service_type, str1, str2 ); + pD->i_service_type, str1, str2 ); vlc_meta_Add( p_meta, "Name", str2 ); vlc_meta_Add( p_meta, "Provider", str1 ); if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 ) - vlc_meta_Add( p_meta, "Type", psz_type[pD->i_service_type] ); + vlc_meta_Add( p_meta, "Type", ppsz_type[pD->i_service_type] ); } } @@ -2452,7 +2529,6 @@ else vlc_meta_Add( p_meta, "Status", "Unknown" ); - es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META, p_srv->i_service_id, p_meta ); vlc_meta_Delete( p_meta ); @@ -2461,26 +2537,195 @@ sdt->psi->i_sdt_version = p_sdt->i_version; dvbpsi_DeleteSDT( p_sdt ); } -#if 0 -static void DecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d ) + +/* i_year: year - 1900 i_month: 0-11 i_mday: 1-31 i_hour: 0-23 i_minute: 0-59 i_second: 0-59 */ +static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int i_minute, int i_second ) { - int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 ); - int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 ); + static const int pn_day[12+1] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; + int64_t i_day; + int i; + + if( i_year < 70 || + i_month < 0 || i_month > 11 || i_mday < 1 || i_mday > 31 || + i_hour < 0 || i_hour > 23 || i_minute < 0 || i_minute > 59 || i_second < 0 || i_second > 59 ) + return -1; + /* Count the number of days */ + i_day = 365 * (i_year-70) + pn_day[i_month] + i_mday - 1; +#define LEAP(y) ( ((y)%4) == 0 && (((y)%100) != 0 || ((y)%400) == 0) ? 1 : 0) + for( i = 70; i < i_year; i++ ) + i_day += LEAP(1900+i); + if( i_month > 1 ) + i_day += LEAP(1900+i_year); +#undef LEAP + /**/ + return ((24*i_day + i_hour)*60 + i_minute)*60 + i_second; +} + +static void EITDecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d ) +{ + const int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 ); + const int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 ); + const int c = ( mp == 14 || mp == 15 ) ? 1 : 0; + + *p_y = 1900 + yp + c*1; + *p_m = mp - 1 - c*12; *p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001); +} +#define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf)) +static int64_t EITConvertStartTime( uint64_t i_date ) +{ + const int i_mjd = i_date >> 24; + const int i_hour = CVT_FROM_BCD(i_date >> 16); + const int i_minute = CVT_FROM_BCD(i_date >> 8); + const int i_second = CVT_FROM_BCD(i_date ); + int i_year; + int i_month; + int i_day; - if( mp == 14 || mp == 15 ) - { - *p_y = yp + 1; - *p_m = mp - 1 + 12; + /* if all 40 bits are 1, the start is unknown */ + if( i_date == UINT64_C(0xffffffffff) ) + return -1; + + EITDecodeMjd( i_mjd, &i_year, &i_month, &i_day ); + return vlc_timegm( i_year - 1900, i_month - 1, i_day, i_hour, i_minute, i_second ); +} +static int EITConvertDuration( uint32_t i_duration ) +{ + return CVT_FROM_BCD(i_duration >> 16) * 3600 + + CVT_FROM_BCD(i_duration >> 8 ) * 60 + + CVT_FROM_BCD(i_duration ); +} +#undef CVT_FROM_BCD + +/* FIXME same than dvbsi_to_utf8 from dvb access */ +static char *EITConvertToUTF8( const unsigned char *psz_instring, + size_t i_length ) +{ + const char *psz_encoding; + char *psz_outstring; + char psz_encbuf[sizeof( "ISO_8859-123" )]; + size_t i_in, i_out, offset = 1; + vlc_iconv_t iconv_handle; + + if( i_length < 1 ) return NULL; + if( psz_instring[0] >= 0x20 ) + { + psz_encoding = "ISO_8859-1"; + /* According to the specification, this should be ISO6937, + * but it seems Latin-1 is used instead. */ + offset = 0; + } + else switch( psz_instring[0] ) + { + case 0x01: + psz_encoding = "ISO_8859-5"; + break; + case 0x02: + psz_encoding = "ISO_8859-6"; + break; + case 0x03: + psz_encoding = "ISO_8859-7"; + break; + case 0x04: + psz_encoding = "ISO_8859-8"; + break; + case 0x05: + psz_encoding = "ISO_8859-9"; + break; + case 0x06: + psz_encoding = "ISO_8859-10"; + break; + case 0x07: + psz_encoding = "ISO_8859-11"; + break; + case 0x08: + psz_encoding = "ISO_8859-12"; + break; + case 0x09: + psz_encoding = "ISO_8859-13"; + break; + case 0x0a: + psz_encoding = "ISO_8859-14"; + break; + case 0x0b: + psz_encoding = "ISO_8859-15"; + break; + case 0x10: +#warning Is Latin-10 (psz_instring[2] == 16) really illegal? + if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15 + || psz_instring[2] == 0 ) + { + psz_encoding = "UTF-8"; + offset = 0; + } + else + { + sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] ); + psz_encoding = psz_encbuf; + offset = 3; + } + break; + case 0x11: +#warning Is there a BOM or do we use a fixed endianess? + psz_encoding = "UTF-16"; + break; + case 0x12: + psz_encoding = "KSC5601-1987"; + break; + case 0x13: + psz_encoding = "GB2312"; /* GB-2312-1980 */ + break; + case 0x14: + psz_encoding = "BIG-5"; + break; + case 0x15: + psz_encoding = "UTF-8"; + break; + default: + /* invalid */ + psz_encoding = "UTF-8"; + offset = 0; + } + + i_in = i_length - offset; + i_out = i_in * 6 + 1; + + psz_outstring = malloc( i_out ); + if( !psz_outstring ) + { + return NULL; + } + + iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding ); + if( iconv_handle == (vlc_iconv_t)(-1) ) + { + /* Invalid character set (e.g. ISO_8859-12) */ + memcpy( psz_outstring, &psz_instring[offset], i_in ); + psz_outstring[i_in] = '\0'; + EnsureUTF8( psz_outstring ); } else { - *p_y = yp; - *p_m = mp - 1; + const char *psz_in = (const char *)&psz_instring[offset]; + char *psz_out = psz_outstring; + + while( vlc_iconv( iconv_handle, &psz_in, &i_in, + &psz_out, &i_out ) == (size_t)(-1) ) + { + /* skip naughty byte. This may fail terribly for multibyte stuff, + * but what can we do anyway? */ + psz_in++; + i_in--; + vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */ + } + vlc_iconv_close( iconv_handle ); + + *psz_out = '\0'; } + return psz_outstring; } -#endif + static void EITEventFixString( unsigned char *psz ) { int i_len; @@ -2491,14 +2736,16 @@ if( ( i_len = strlen( (char *) psz ) ) > 0 ) memmove( &psz[0], &psz[1], i_len ); /* Copy the \0 too */ } + static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) { - dvbpsi_eit_event_t *p_evt; + demux_sys_t *p_sys = p_demux->p_sys; vlc_meta_t *p_meta; vlc_bool_t b_event_active = VLC_FALSE; + dvbpsi_eit_event_t *p_evt; msg_Dbg( p_demux, "EITCallBack called" ); - if( !p_eit->b_current_next ) + if( !p_eit->b_current_next || ( p_sys->i_dvb_program != -1 && p_sys->i_dvb_program != p_eit->i_service_id ) ) { dvbpsi_DeleteEIT( p_eit ); return; @@ -2516,32 +2763,20 @@ { dvbpsi_descriptor_t *p_dr; char *psz_cat = malloc( strlen("Event")+10 ); - char psz_start[15]; - char psz_duration[15]; - char psz_name[256]; - char psz_text[256]; + char *psz_name = NULL; + char *psz_text = NULL; char *psz_extra = strdup(""); char *psz_value; + int64_t i_start; + int i_duration; sprintf( psz_cat, "Event %d", p_evt->i_event_id ); - sprintf( psz_start, "%d%d:%d%d:%d%d", - (int)(p_evt->i_start_time >> 20)&0xf, - (int)(p_evt->i_start_time >> 16)&0xf, - (int)(p_evt->i_start_time >> 12)&0xf, - (int)(p_evt->i_start_time >> 8)&0xf, - (int)(p_evt->i_start_time >> 4)&0xf, - (int)(p_evt->i_start_time )&0xf ); - sprintf( psz_duration, "%d%d:%d%d:%d%d", - (p_evt->i_duration >> 20)&0xf, (p_evt->i_duration >> 16)&0xf, - (p_evt->i_duration >> 12)&0xf, (p_evt->i_duration >> 8)&0xf, - (p_evt->i_duration >> 4)&0xf, (p_evt->i_duration )&0xf ); - psz_name[0] = psz_text[0] = '\0'; + i_start = EITConvertStartTime( p_evt->i_start_time ); + i_duration = EITConvertDuration( p_evt->i_duration ); - msg_Dbg( p_demux, " * event id=%d start_time:mjd=%d %s duration=%s " + msg_Dbg( p_demux, " * event id=%d start_time:%d duration=%d " "running=%d free_ca=%d", - p_evt->i_event_id, - (int)(p_evt->i_start_time >> 24), - psz_start, psz_duration, + p_evt->i_event_id, (int)i_start, (int)i_duration, p_evt->i_running_status, p_evt->b_free_ca ); for( p_dr = p_evt->p_first_descriptor; p_dr; p_dr = p_dr->p_next ) @@ -2552,13 +2787,8 @@ if( pE ) { - memcpy( psz_name, pE->i_event_name, pE->i_event_name_length); - psz_name[pE->i_event_name_length] = '\0'; - memcpy( psz_text, pE->i_text, pE->i_text_length ); - psz_text[pE->i_text_length] = '\0'; - - EITEventFixString((unsigned char *)&psz_name); - EITEventFixString((unsigned char *)&psz_text); + psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length); + psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length ); msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'", pE->i_iso_639_code, psz_name, psz_text ); } @@ -2574,6 +2804,7 @@ int i; msg_Dbg( p_demux, " - extended event lang=%3.3s", pE->i_iso_639_code ); + for( i = 0; i < pE->i_entry_count; i++ ) { memcpy( str1, pE->i_item_description[i], @@ -2613,10 +2844,10 @@ } } - asprintf( &psz_value, "%s: %s (+%s) %s (%s)", - psz_start, + asprintf( &psz_value, ""I64Fd": %s (+%d) %s (%s)", + i_start, psz_name, - psz_duration, + i_duration, psz_text, psz_extra ); vlc_meta_Add( p_meta, psz_cat, psz_value ); free( psz_value ); @@ -2647,10 +2878,7 @@ msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", i_table_id, i_table_id, i_extension, i_extension ); #endif - if( p_demux->p_sys->pid[0].psi->i_pat_version == -1 ) - return; - - if( i_table_id == 0x42 ) + if( p_demux->p_sys->pid[0].psi->i_pat_version != -1 && i_table_id == 0x42 ) { msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", i_table_id, i_table_id, i_extension, i_extension ); @@ -2658,8 +2886,9 @@ dvbpsi_AttachSDT( h, i_table_id, i_extension, (dvbpsi_sdt_callback)SDTCallBack, p_demux ); } - else if( i_table_id == 0x4e || /* Current/Following */ - ( i_table_id >= 0x50 && i_table_id <= 0x5f ) ) /* Schedule */ + else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 && + ( i_table_id == 0x4e || /* Current/Following */ + (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */ { msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", i_table_id, i_table_id, i_extension, i_extension ); @@ -2917,9 +3146,10 @@ if( pid->es->fmt.i_extra > 0 ) { pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra ); - memcpy( pid->es->fmt.p_extra, - dcd->p_decoder_specific_info, - pid->es->fmt.i_extra ); + if( pid->es->fmt.p_extra ) + memcpy( pid->es->fmt.p_extra, + dcd->p_decoder_specific_info, + pid->es->fmt.i_extra ); } } } @@ -3004,18 +3234,23 @@ msg_Dbg( p_demux, " * Stream Component Identifier: %d", si->i_component_tag ); } #endif - else if( p_dr->i_tag == 0x56 ) + else if( (p_dr->i_tag == 0x56) || (p_dr->i_tag == 0x46) ) { - msg_Dbg( p_demux, " * EBU Teletext descriptor" ); + if( p_dr->i_tag == 0x46 ) + msg_Dbg( p_demux, " * VBI Teletext descriptor" ); + else + msg_Dbg( p_demux, " * EBU Teletext descriptor" ); + pid->es->fmt.i_cat = SPU_ES; pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' ); pid->es->fmt.i_extra = p_dr->i_length; pid->es->fmt.p_extra = malloc( p_dr->i_length ); - memcpy( pid->es->fmt.p_extra, p_dr->p_data, - p_dr->i_length ); + if( pid->es->fmt.p_extra ) + memcpy( pid->es->fmt.p_extra, p_dr->p_data, + p_dr->i_length ); -#if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \ - && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5) +#if defined(_DVBPSI_DR_56_H_) && defined(DVBPSI_VERSION) \ + && (DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)) pid->es->fmt.i_group = p_pmt->i_program_number; /* In stream output mode, only enable descriptor @@ -3033,8 +3268,8 @@ for( n = 0; n < sub->i_pages_number; n++ ) { dvbpsi_teletextpage_t *p_page = &sub->p_pages[n]; - if( p_page->i_teletext_type == 0x2 - || p_page->i_teletext_type == 0x5 ) + if( (p_page->i_teletext_type == 0x2) + || (p_page->i_teletext_type == 0x5) ) { ts_es_t *p_es; @@ -3045,7 +3280,13 @@ else { p_es = malloc( sizeof( ts_es_t ) ); - p_es->fmt = pid->es->fmt; + if( !p_es ) break; + + es_format_Copy( &p_es->fmt, &pid->es->fmt ); + free( p_es->fmt.psz_language ); + free( p_es->fmt.psz_description ); + p_es->fmt.psz_language = NULL; + p_es->fmt.psz_description = NULL; p_es->id = NULL; p_es->p_pes = NULL; p_es->i_pes_size = 0; @@ -3058,15 +3299,17 @@ } p_es->fmt.psz_language = malloc( 4 ); - memcpy( p_es->fmt.psz_language, - p_page->i_iso6392_language_code, 3 ); - p_es->fmt.psz_language[3] = 0; - + if( p_es->fmt.psz_language ) + { + memcpy( p_es->fmt.psz_language, + p_page->i_iso6392_language_code, 3 ); + p_es->fmt.psz_language[3] = 0; + } switch( p_page->i_teletext_type ) { case 0x2: p_es->fmt.psz_description = - strdup(_("subtitles")); + strdup(_("Teletext subtitles")); msg_Dbg( p_demux, " * sub lan=%s page=%d%x", p_es->fmt.psz_language, @@ -3076,7 +3319,7 @@ case 0x5: p_es->fmt.psz_description = - strdup(_("hearing impaired")); + strdup(_("Teletext hearing impaired subtitles")); msg_Dbg( p_demux, " * hearing impaired lan=%s page=%d%x", p_es->fmt.psz_language, @@ -3114,8 +3357,9 @@ pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' ); pid->es->fmt.i_extra = p_dr->i_length; pid->es->fmt.p_extra = malloc( p_dr->i_length ); - memcpy( pid->es->fmt.p_extra, p_dr->p_data, - p_dr->i_length ); + if( pid->es->fmt.p_extra ) + memcpy( pid->es->fmt.p_extra, p_dr->p_data, + p_dr->i_length ); #ifdef _DVBPSI_DR_59_H_ pid->es->fmt.i_group = p_pmt->i_program_number; @@ -3142,7 +3386,11 @@ else { p_es = malloc( sizeof( ts_es_t ) ); - p_es->fmt = pid->es->fmt; + if( !p_es ) break; + es_format_Copy( &p_es->fmt, &pid->es->fmt ); + free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL; + free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL; + p_es->id = NULL; p_es->p_pes = NULL; p_es->i_pes_size = 0; @@ -3155,9 +3403,12 @@ } p_es->fmt.psz_language = malloc( 4 ); - memcpy( p_es->fmt.psz_language, - p_sub->i_iso6392_language_code, 3 ); - p_es->fmt.psz_language[3] = 0; + if( p_es->fmt.psz_language ) + { + memcpy( p_es->fmt.psz_language, + p_sub->i_iso6392_language_code, 3 ); + p_es->fmt.psz_language[3] = 0; + } switch( p_sub->i_subtitling_type ) { @@ -3218,6 +3469,46 @@ } } } + else if( p_es->i_type == 0xEA ) + { + dvbpsi_descriptor_t *p_dr; + + for( p_dr = p_es->p_first_descriptor; p_dr != NULL; + p_dr = p_dr->p_next ) + { + msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", + p_es->i_pid, p_es->i_type, p_dr->i_tag ); + + if( p_dr->i_tag == 0x05 ) + { + /* Registration Descriptor */ + if( p_dr->i_length < 4 ) // XXX VC-1 has extended this descriptor with sub-descriptor + { + msg_Warn( p_demux, "invalid Registration Descriptor" ); + } + else + { + if( !memcmp( p_dr->p_data, "VC-1", 4 ) ) + { + /* registration descriptor for VC-1 (SMPTE rp227) */ + pid->es->fmt.i_cat = VIDEO_ES; + pid->es->fmt.i_codec = VLC_FOURCC('W','V','C','1'); + + /* XXX With Simple and Main profile the SEQUENCE + * header is modified: video width and height are + * inserted just after the start code as 2 int16_t + * The packetizer will take care of that. */ + } + else + { + msg_Warn( p_demux, + "unknown Registration Descriptor (%4.4s)", + p_dr->p_data ); + } + } + } + } + } else if( p_es->i_type == 0xa0 ) { /* MSCODEC sent by vlc */ @@ -3235,14 +3526,15 @@ ( p_dr->p_data[4] << 8 ) | p_dr->p_data[5]; pid->es->fmt.video.i_height = ( p_dr->p_data[6] << 8 ) | p_dr->p_data[7]; - pid->es->fmt.i_extra = + pid->es->fmt.i_extra = (p_dr->p_data[8] << 8) | p_dr->p_data[9]; if( pid->es->fmt.i_extra > 0 ) { pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra ); - memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10], - pid->es->fmt.i_extra ); + if( pid->es->fmt.p_extra ) + memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10], + pid->es->fmt.i_extra ); } } else @@ -3273,10 +3565,13 @@ { #if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2) pid->es->fmt.psz_language = malloc( 4 ); - memcpy( pid->es->fmt.psz_language, - p_decoded->code[0].iso_639_code, 3 ); - pid->es->fmt.psz_language[3] = 0; - msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language); + if( pid->es->fmt.psz_language ) + { + memcpy( pid->es->fmt.psz_language, + p_decoded->code[0].iso_639_code, 3 ); + pid->es->fmt.psz_language[3] = 0; + msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language); + } switch( p_decoded->code[0].i_audio_type ) { case 0: pid->es->fmt.psz_description = NULL; @@ -3304,43 +3599,53 @@ pid->es->fmt.p_extra_languages = malloc( sizeof(*pid->es->fmt.p_extra_languages) * pid->es->fmt.i_extra_languages ); - for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) { - msg_Dbg( p_demux, "bang" ); - pid->es->fmt.p_extra_languages[i].psz_language = - malloc(4); - memcpy(pid->es->fmt.p_extra_languages[i].psz_language, - p_decoded->code[i+1].iso_639_code, 3 ); - pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0'; - switch( p_decoded->code[i].i_audio_type ) { - case 0: - pid->es->fmt.p_extra_languages[i].psz_description = - NULL; - break; - case 1: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("clean effects")); - break; - case 2: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("hearing impaired")); - break; - case 3: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("visual impaired commentary")); - break; - default: - msg_Dbg( p_demux, "unknown audio type: %d", - p_decoded->code[i].i_audio_type); - pid->es->fmt.psz_description = NULL; - break; - } + if( pid->es->fmt.p_extra_languages ) + { + for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) + { + msg_Dbg( p_demux, "bang" ); + pid->es->fmt.p_extra_languages[i].psz_language = + malloc(4); + if( pid->es->fmt.p_extra_languages[i].psz_language ) + { + memcpy( pid->es->fmt.p_extra_languages[i].psz_language, + p_decoded->code[i+1].iso_639_code, 3 ); + pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0'; + } + switch( p_decoded->code[i].i_audio_type ) { + case 0: + pid->es->fmt.p_extra_languages[i].psz_description = + NULL; + break; + case 1: + pid->es->fmt.p_extra_languages[i].psz_description = + strdup(_("clean effects")); + break; + case 2: + pid->es->fmt.p_extra_languages[i].psz_description = + strdup(_("hearing impaired")); + break; + case 3: + pid->es->fmt.p_extra_languages[i].psz_description = + strdup(_("visual impaired commentary")); + break; + default: + msg_Dbg( p_demux, "unknown audio type: %d", + p_decoded->code[i].i_audio_type); + pid->es->fmt.psz_description = NULL; + break; + } + } } #else pid->es->fmt.psz_language = malloc( 4 ); - memcpy( pid->es->fmt.psz_language, - p_decoded->i_iso_639_code, 3 ); - pid->es->fmt.psz_language[3] = 0; + if( pid->es->fmt.psz_language ) + { + memcpy( pid->es->fmt.psz_language, + p_decoded->i_iso_639_code, 3 ); + pid->es->fmt.psz_language[3] = 0; + } #endif } } @@ -3629,4 +3934,3 @@ dvbpsi_DeletePAT( p_pat ); } - diff -Nur --exclude po vlc-0.8.6d/modules/demux/util/Makefile.in vlc-0.8.6e/modules/demux/util/Makefile.in --- vlc-0.8.6d/modules/demux/util/Makefile.in 2007-11-28 06:23:27.000000000 +1100 +++ vlc-0.8.6e/modules/demux/util/Makefile.in 2008-02-25 06:07:29.000000000 +1100 @@ -175,6 +175,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -269,6 +270,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/beos/Makefile.in vlc-0.8.6e/modules/gui/beos/Makefile.in --- vlc-0.8.6d/modules/gui/beos/Makefile.in 2007-11-28 06:23:28.000000000 +1100 +++ vlc-0.8.6e/modules/gui/beos/Makefile.in 2008-02-25 06:07:29.000000000 +1100 @@ -226,6 +226,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -320,6 +321,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/embeddedwindow.m vlc-0.8.6e/modules/gui/macosx/embeddedwindow.m --- vlc-0.8.6d/modules/gui/macosx/embeddedwindow.m 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/embeddedwindow.m 2008-01-18 08:31:51.000000000 +1100 @@ -1,29 +1,29 @@ /***************************************************************************** - * embeddedwindow.m: MacOS X interface module - ***************************************************************************** - * Copyright (C) 2002-2005 the VideoLAN team - * $Id: embeddedwindow.m 23150 2007-11-18 23:30:42Z fkuehne $ - * - * Authors: Benjamin Pracht - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ +* embeddedwindow.m: MacOS X interface module +***************************************************************************** +* Copyright (C) 2002-2005 the VideoLAN team +* $Id: embeddedwindow.m 24196 2008-01-08 13:40:36Z fkuehne $ +* +* Authors: Benjamin Pracht +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. +*****************************************************************************/ /***************************************************************************** - * Preamble - *****************************************************************************/ +* Preamble +*****************************************************************************/ /* DisableScreenUpdates, SetSystemUIMode, ... */ #import @@ -35,40 +35,40 @@ #import "controls.h" /***************************************************************************** - * VLCEmbeddedWindow Implementation - *****************************************************************************/ +* VLCEmbeddedWindow Implementation +*****************************************************************************/ @implementation VLCEmbeddedWindow - (void)awakeFromNib { [self setDelegate: self]; - + [o_btn_backward setToolTip: _NS("Rewind")]; [o_btn_forward setToolTip: _NS("Fast Forward")]; [o_btn_fullscreen setToolTip: _NS("Fullscreen")]; [o_btn_play setToolTip: _NS("Play")]; [o_slider setToolTip: _NS("Position")]; - + o_img_play = [NSImage imageNamed: @"play_embedded"]; o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"]; o_img_pause = [NSImage imageNamed: @"pause_embedded"]; o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"]; - + o_saved_frame = NSMakeRect( 0.0f, 0.0f, 0.0f, 0.0f ); - + /* Useful to save o_view frame in fullscreen mode */ o_temp_view = [[NSView alloc] init]; [o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable]; - + o_fullscreen_window = nil; - + /* Not fullscreen when we wake up */ [o_btn_fullscreen setState: NO]; b_fullscreen = NO; /* Use a recursive lock to be able to trigger enter/leavefullscreen - * in middle of an animation, providing that the enter/leave functions - * are called from the same thread */ + * in middle of an animation, providing that the enter/leave functions + * are called from the same thread */ o_animation_lock = [[NSRecursiveLock alloc] init]; b_animation_lock_alreadylocked = NO; } @@ -114,14 +114,14 @@ NSRect zoomRect = [[self screen] frame]; o_saved_frame = [self frame]; /* we don't have to take care of the eventual menu bar and dock - as zoomRect will be cropped automatically by setFrame:display: - to the right rectangle */ + as zoomRect will be cropped automatically by setFrame:display: + to the right rectangle */ [self setFrame: zoomRect display: YES animate: YES]; } else { /* unzoom to the saved_frame if the o_saved_frame coords look sound - (just in case) */ + (just in case) */ if( o_saved_frame.size.width > 0 && o_saved_frame.size.height > 0 ) [self setFrame: o_saved_frame display: YES animate: YES]; } @@ -130,12 +130,12 @@ - (BOOL)windowShouldClose:(id)sender { playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + FIND_ANYWHERE ); if( p_playlist == NULL ) { return NO; } - + playlist_Stop( p_playlist ); vlc_object_release( p_playlist ); return YES; @@ -150,8 +150,8 @@ } /***************************************************************************** - * Fullscreen support - */ +* Fullscreen support +*/ - (BOOL)isFullscreen { @@ -175,65 +175,67 @@ NSRect rect; vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); BOOL blackout_other_displays = var_GetBool( p_vout, "macosx-black" ); + + screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )]; + if( !screen ) + { + msg_Dbg( p_vout, "chosen screen isn't present, using current screen for fullscreen mode" ); + screen = [self screen]; + } - screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )]; - - vlc_object_release( p_vout ); - [self lockFullscreenAnimation]; - if (!screen) - screen = [self screen]; - + vlc_object_release( p_vout ); + screen_rect = [screen frame]; - + [o_btn_fullscreen setState: YES]; - + [NSCursor setHiddenUntilMouseMoves: YES]; - + /* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */ if (!o_fullscreen_window) { /* We can't change the styleMask of an already created NSWindow, so we create an other window, and do eye catching stuff */ - + rect = [[o_view superview] convertRect: [o_view frame] toView: nil]; /* Convert to Window base coord */ rect.origin.x += [self frame].origin.x; rect.origin.y += [self frame].origin.y; o_fullscreen_window = [[VLCWindow alloc] initWithContentRect:rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]; [o_fullscreen_window setBackgroundColor: [NSColor blackColor]]; [o_fullscreen_window setCanBecomeKeyWindow: YES]; - + CGDisplayFadeReservationToken token; - + [o_fullscreen_window setFrame:screen_rect display:NO]; - + CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); - + if ([screen isMainScreen]) SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); - + if (blackout_other_displays) [screen blackoutOtherScreens]; /* We should do something like [screen blackoutOtherScreens]; */ - + [o_view retain]; - [[self contentView] replaceSubview:o_view with:o_temp_view]; + [[self contentView] replaceSubview:o_view with:o_temp_view]; [o_temp_view setFrame:[o_view frame]]; [o_fullscreen_window setContentView:o_view]; [o_view release]; [o_fullscreen_window makeKeyAndOrderFront:self]; - + CGDisplayFade( token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO ); CGReleaseDisplayFadeReservation( token); - + /* Will release the lock */ [self hasBecomeFullscreen]; return; } - + if (blackout_other_displays) [screen blackoutOtherScreens]; /* We should do something like [screen blackoutOtherScreens]; */ - + b_animation_lock_alreadylocked = NO; [self unlockFullscreenAnimation]; } @@ -241,15 +243,15 @@ - (void)hasBecomeFullscreen { [o_fullscreen_window makeFirstResponder: [[[VLCMain sharedInstance] getControls] getVoutView]]; - + [o_fullscreen_window makeKeyWindow]; [o_fullscreen_window setAcceptsMouseMovedEvents: TRUE]; - + /* tell the fspanel to move itself to front next time it's triggered */ - [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]]; - + [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: [o_fullscreen_window screen]]; + [super orderOut: self]; - + [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; b_fullscreen = YES; [self unlockFullscreenAnimation]; @@ -263,39 +265,39 @@ - (void)leaveFullscreenAndFadeOut: (BOOL)fadeout { [self lockFullscreenAnimation]; - + b_fullscreen = NO; [o_btn_fullscreen setState: NO]; - + /* Don't do anything if o_fullscreen_window is already closed */ if (!o_fullscreen_window) { /* We always try to do so */ [NSScreen unblackoutScreens]; - + b_animation_lock_alreadylocked = NO; [self unlockFullscreenAnimation]; return; } - + /* simply fade the display */ CGDisplayFadeReservationToken token; - + CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); - + [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil]; SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar); - + /* We always try to do so */ [NSScreen unblackoutScreens]; - + if (!fadeout) [self orderFront: self]; - + /* Will release the lock */ [self hasEndedFullscreen]; - + CGDisplayFade( token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO ); CGReleaseDisplayFadeReservation( token); } @@ -315,7 +317,7 @@ [self makeKeyAndOrderFront:self]; [o_fullscreen_window orderOut: self]; EnableScreenUpdates(); - + [o_fullscreen_window release]; o_fullscreen_window = nil; b_animation_lock_alreadylocked = NO; @@ -330,26 +332,26 @@ } /* Make sure setFrame gets executed on main thread especially if we are animating. - * (Thus we won't block the video output thread) */ +* (Thus we won't block the video output thread) */ - (void)setFrame:(NSRect)frame display:(BOOL)display animate:(BOOL)animate { struct { NSRect frame; BOOL display; BOOL animate;} args; NSData *packedargs; - + args.frame = frame; args.display = display; args.animate = animate; - + packedargs = [NSData dataWithBytes:&args length:sizeof(args)]; - + [self performSelectorOnMainThread:@selector(setFrameOnMainThread:) - withObject: packedargs waitUntilDone: YES]; + withObject: packedargs waitUntilDone: YES]; } - (void)setFrameOnMainThread:(NSData*)packedargs { struct args { NSRect frame; BOOL display; BOOL animate; } * args = (struct args*)[packedargs bytes]; - + [super setFrame: args->frame display: args->display animate:args->animate]; } diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/fspanel.h vlc-0.8.6e/modules/gui/macosx/fspanel.h --- vlc-0.8.6d/modules/gui/macosx/fspanel.h 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/fspanel.h 2008-01-18 08:31:51.000000000 +1100 @@ -34,7 +34,7 @@ BOOL b_nonActive; BOOL b_displayed; BOOL b_voutWasUpdated; - int i_device; + NSScreen * o_screen; } - (id)initWithContentRect: (NSRect)contentRect styleMask: (unsigned int)aStyle @@ -70,7 +70,7 @@ - (void)mouseDragged:(NSEvent *)theEvent; - (BOOL)isDisplayed; -- (void)setVoutWasUpdated: (int) i_screen; +- (void)setVoutWasUpdated: (NSScreen *) o_screen; @end @interface VLCFSPanelView : NSView diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/fspanel.m vlc-0.8.6e/modules/gui/macosx/fspanel.m --- vlc-0.8.6d/modules/gui/macosx/fspanel.m 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/fspanel.m 2008-01-18 08:31:51.000000000 +1100 @@ -29,6 +29,7 @@ #import "controls.h" #import "vout.h" #import "fspanel.h" +#import "misc.h" #define KEEP_VISIBLE_AFTER_ACTION 4 /* time in half-sec until this panel will hide again after an user's action */ @@ -50,7 +51,7 @@ /* let the window sit on top of everything else and start out completely transparent */ [win setLevel:NSFloatingWindowLevel]; [win setAlphaValue:0.0]; - i_device = 0; + o_screen = nil; [win center]; return win; @@ -109,13 +110,11 @@ NSRect theScreensFrame; NSRect theWindowsFrame; - if( i_device < 0 || i_device >= (signed int)[[NSScreen screens] count] ) - /* invalid preferences or none specified, using main screen */ - theScreensFrame = [[NSScreen mainScreen] frame]; + if( o_screen ) + theScreensFrame = [o_screen frame]; else - /* user-defined screen */ - theScreensFrame = [[[NSScreen screens] objectAtIndex: i_device] frame]; - + theScreensFrame = [[NSScreen mainScreen] frame]; + theWindowsFrame = [self frame]; theCoordinate.x = (theScreensFrame.size.width - theWindowsFrame.size.width) / 2 + theScreensFrame.origin.x; @@ -343,12 +342,12 @@ return b_displayed; } -- (void)setVoutWasUpdated: (int)i_newdevice; +- (void)setVoutWasUpdated: (NSScreen *)o_new_screen; { b_voutWasUpdated = YES; - if( i_newdevice != i_device ) + if( ![o_new_screen isScreen: o_screen] ) { - i_device = i_newdevice; + o_screen = o_new_screen; [self center]; } } diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/intf.h vlc-0.8.6e/modules/gui/macosx/intf.h --- vlc-0.8.6d/modules/gui/macosx/intf.h 2007-11-28 06:27:50.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/intf.h 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * intf.h: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2006 the VideoLAN team - * $Id: intf.h 23381 2007-11-27 19:26:51Z fkuehne $ + * $Id: intf.h 23943 2007-12-30 14:59:04Z fkuehne $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -106,6 +106,7 @@ BOOL nib_wizard_loaded; /* reference to the wizard-nib */ BOOL nib_extended_loaded; /* reference to the extended-nib */ BOOL nib_bookmarks_loaded; /* reference to the bookmarks-nib */ + BOOL nib_prefs_loaded; /* reference to the prefs-nib */ BOOL nib_update_loaded; /* reference to the update-nib */ IBOutlet id o_window; /* main window */ diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/intf.m vlc-0.8.6e/modules/gui/macosx/intf.m --- vlc-0.8.6d/modules/gui/macosx/intf.m 2007-11-28 09:15:22.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/intf.m 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * intf.m: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2006 the VideoLAN team - * $Id: intf.m 23388 2007-11-27 22:14:22Z fkuehne $ + * $Id: intf.m 24166 2008-01-07 14:55:36Z fkuehne $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -191,10 +191,14 @@ vlc_value_t old_val, vlc_value_t new_val, void *param ) { intf_thread_t * p_intf = VLCIntf; - p_intf->p_sys->b_playlist_update = VLC_TRUE; - p_intf->p_sys->b_intf_update = VLC_TRUE; - p_intf->p_sys->b_playmode_update = VLC_TRUE; - return VLC_SUCCESS; + if( p_intf && !p_intf->b_die ) + { + p_intf->p_sys->b_playlist_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = VLC_TRUE; + p_intf->p_sys->b_playmode_update = VLC_TRUE; + return VLC_SUCCESS; + } + return VLC_EGENERIC; } /***************************************************************************** @@ -339,7 +343,7 @@ } o_about = [[VLAboutBox alloc] init]; - o_prefs = nil; + o_prefs = [[VLCPrefs alloc] init]; o_open = [[VLCOpen alloc] init]; o_wizard = [[VLCWizard alloc] init]; o_extended = nil; @@ -673,21 +677,6 @@ [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf var: "intf-add" selector: @selector(toggleVar:)]; - /* check whether the user runs a valid version of OSX; alert is auto-released */ - if( MACOS_VERSION < 10.4f ) - { - NSAlert *ourAlert; - int i_returnValue; - ourAlert = [NSAlert alertWithMessageText: _NS("Your version of Mac OS X is not supported") - defaultButton: _NS("Quit") - alternateButton: NULL - otherButton: NULL - informativeTextWithFormat: _NS("VLC media player requires Mac OS X 10.4 or higher.")]; - [ourAlert setAlertStyle: NSCriticalAlertStyle]; - i_returnValue = [ourAlert runModal]; - [NSApp terminate: self]; - } - vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); } @@ -1552,8 +1541,6 @@ { playlist_t * p_playlist; vout_thread_t * p_vout; - - msg_Dbg( p_intf, "applicationWillTerminate" ); #define p_input p_intf->p_sys->p_input if( p_input ) @@ -1598,6 +1585,9 @@ if( nib_about_loaded && o_about ) [o_about release]; + if( nib_prefs_loaded && o_prefs ) + [o_prefs release]; + if( nib_open_loaded && o_open ) [o_open release]; @@ -1772,19 +1762,16 @@ - (IBAction)viewAbout:(id)sender { if (!nib_about_loaded) - { nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; - [o_about showPanel]; - } else { - [o_about showPanel]; - } + + [o_about showPanel]; } - (IBAction)viewPreferences:(id)sender { -/* GRUIIIIIIIK */ - if( o_prefs == nil ) - o_prefs = [[VLCPrefs alloc] init]; + if (!nib_prefs_loaded) + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner:self]; + [o_prefs showPrefs]; } diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/macosx.m vlc-0.8.6e/modules/gui/macosx/macosx.m --- vlc-0.8.6d/modules/gui/macosx/macosx.m 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/macosx.m 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * macosx.m: Mac OS X module for vlc ***************************************************************************** * Copyright (C) 2001-2007 the VideoLAN team - * $Id: macosx.m 18494 2007-01-03 22:06:34Z fkuehne $ + * $Id: macosx.m 24166 2008-01-07 14:55:36Z fkuehne $ * * Authors: Colin Delacroix * Eugenio Jarosiewicz @@ -94,7 +94,7 @@ set_category( CAT_INTERFACE ); set_subcategory( SUBCAT_INTERFACE_MAIN ); add_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT, - VLC_FALSE ); + VLC_TRUE ); add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT, VLC_FALSE ); add_bool( "macosx-wizard-keep", 1, NULL, WIZARD_OPTIONS_SAVING_TEXT, diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/Makefile.in vlc-0.8.6e/modules/gui/macosx/Makefile.in --- vlc-0.8.6d/modules/gui/macosx/Makefile.in 2007-11-28 06:23:29.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/Makefile.in 2008-02-25 06:07:30.000000000 +1100 @@ -252,6 +252,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -346,6 +347,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/prefs.m vlc-0.8.6e/modules/gui/macosx/prefs.m --- vlc-0.8.6d/modules/gui/macosx/prefs.m 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/prefs.m 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * prefs.m: MacOS X module for vlc ***************************************************************************** * Copyright (C) 2002-2006 the VideoLAN team - * $Id: prefs.m 18150 2006-11-29 13:32:25Z courmisch $ + * $Id: prefs.m 23943 2007-12-30 14:59:04Z fkuehne $ * * Authors: Jon Lech Johansen * Derk-Jan Hartman @@ -108,9 +108,6 @@ - (void)showPrefs { - /* load our nib (if not already loaded) */ - [NSBundle loadNibNamed:@"Preferences" owner:self]; - [o_prefs_window center]; [o_prefs_window makeKeyAndOrderFront:self]; } diff -Nur --exclude po vlc-0.8.6d/modules/gui/macosx/vout.m vlc-0.8.6e/modules/gui/macosx/vout.m --- vlc-0.8.6d/modules/gui/macosx/vout.m 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/gui/macosx/vout.m 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * vout.m: MacOS X video output module ***************************************************************************** * Copyright (C) 2001-2007 the VideoLAN team - * $Id: vout.m 23121 2007-11-18 15:07:03Z pdherbemont $ + * $Id: vout.m 24195 2008-01-08 13:22:38Z fkuehne $ * * Authors: Colin Delacroix * Florian G. Pflug @@ -71,10 +71,16 @@ - (id)init { [super init]; - o_embedded_array = [NSMutableArray array]; + o_embedded_array = [[NSMutableArray alloc] init]; return self; } +- (void)dealloc +{ + [o_embedded_array release]; + [super dealloc]; +} + - (id)getEmbeddedVout { unsigned int i; @@ -160,6 +166,7 @@ int i_device; NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; NSArray *o_screens = [NSScreen screens]; + NSScreen *o_fullscreen_screen = nil; p_vout = vout; o_view = view; @@ -180,6 +187,10 @@ i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" ); } + o_fullscreen_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device]; + if( !o_fullscreen_screen ) + o_fullscreen_screen = [[self window] screen]; + /* Setup the menuitem for the multiple displays. */ if( var_Type( p_real_vout, "video-device" ) == 0 ) { @@ -211,10 +222,10 @@ (int)s_rect.size.width, (int)s_rect.size.height ); text.psz_string = psz_temp; - val2.i_int = i; + val2.i_int = (int)[o_screen displayID]; var_Change( p_real_vout, "video-device", VLC_VAR_ADDCHOICE, &val2, &text ); - if( i == i_device ) + if( [o_screen isScreen:o_fullscreen_screen] ) { var_Set( p_real_vout, "video-device", val2 ); } @@ -413,8 +424,9 @@ - (void)manage { /* Disable Screensaver, when we're playing something, but allow it on pause */ - if( VLCIntf->p_sys->i_play_status == PLAYING_S ) - UpdateSystemActivity( UsrActivity ); + if( VLCIntf->p_sys && !VLCIntf->b_die ) + if( VLCIntf->p_sys->i_play_status == PLAYING_S ) + UpdateSystemActivity( UsrActivity ); } - (id)getWindow @@ -937,11 +949,13 @@ { playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( p_playlist ) + { + if(!playlist_IsPlaying( p_playlist )) + [o_window performSelectorOnMainThread: @selector(orderOut:) withObject: self waitUntilDone: YES]; - if(!playlist_IsPlaying( p_playlist )) - [o_window performSelectorOnMainThread: @selector(orderOut:) withObject: self waitUntilDone: YES]; - - vlc_object_release( p_playlist ); + vlc_object_release( p_playlist ); + } [super closeVout]; } @@ -998,20 +1012,11 @@ b_embedded = var_GetBool( p_vout, "macosx-embedded" ); /* Find out on which screen to open the window */ - if( i_device <= 0 || i_device > (int)[o_screens count] ) - { - /* No preference specified. Use the main screen */ - o_screen = [NSScreen mainScreen]; - i_device = [o_screens indexOfObject: o_screen]; - if( o_screen == [o_screens objectAtIndex: 0] ) - b_menubar_screen = VLC_TRUE; - } - else - { - i_device--; - o_screen = [o_screens objectAtIndex: i_device]; - b_menubar_screen = ( i_device == 0 ); - } + o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device]; + if( !o_screen ) + o_screen = [self screen]; + if( [o_screen isMainScreen] ) + b_menubar_screen = VLC_TRUE; if( p_vout->b_fullscreen ) { @@ -1025,7 +1030,7 @@ [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; /* tell the fspanel to move itself to front next time it's triggered */ - [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device]; + [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: o_screen]; /* Creates a window with size: screen_rect on o_screen */ [self initWithContentRect: screen_rect @@ -1051,7 +1056,7 @@ CGDisplayCount dspyCnt; CGPoint gPoint; - if( i == (unsigned int)i_device ) continue; + if( [[o_screens objectAtIndex:i] isScreen: o_screen] ) continue; screen_rect = [[o_screens objectAtIndex: i] frame]; @@ -1149,7 +1154,6 @@ { /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting Command-Q */ - [self setContentView: NULL]; [self performSelectorOnMainThread: @selector(closeReal:) withObject: NULL waitUntilDone: NO]; } @@ -1160,10 +1164,17 @@ { CGDisplayFadeReservationToken token; CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); - CGDisplayFade( token, 2, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); + CGDisplayFade( token, 0.3 , kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); + + [self disableScreenUpdatesUntilFlush]; + [self orderOut: self]; + + CGDisplayFade( token, 0.6 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, YES ); CGReleaseDisplayFadeReservation( token); CGDisplayRestoreColorSyncSettings(); } + [NSScreen unblackoutScreens]; + SetSystemUIMode( kUIModeNormal, 0); [super close]; diff -Nur --exclude po vlc-0.8.6d/modules/gui/Makefile.in vlc-0.8.6e/modules/gui/Makefile.in --- vlc-0.8.6d/modules/gui/Makefile.in 2007-11-28 06:23:27.000000000 +1100 +++ vlc-0.8.6e/modules/gui/Makefile.in 2008-02-25 06:07:29.000000000 +1100 @@ -176,6 +176,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -270,6 +271,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/ncurses.c vlc-0.8.6e/modules/gui/ncurses.c --- vlc-0.8.6d/modules/gui/ncurses.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/gui/ncurses.c 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * ncurses.c : NCurses plugin for vlc ***************************************************************************** * Copyright (C) 2001-2006 the VideoLAN team - * $Id: ncurses.c 18329 2006-12-08 18:07:54Z hartman $ + * $Id: ncurses.c 23953 2007-12-30 20:55:54Z funman $ * * Authors: Sam Hocevar * Laurent Aimar @@ -623,11 +623,12 @@ case ' ': if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' ) { - int i_size_entry = strlen( p_sys->psz_current_dir ) + + int i_size_entry = strlen( "directory://" ) + + strlen( p_sys->psz_current_dir ) + strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2; char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry); - sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ); + sprintf( psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ); playlist_Add( p_sys->p_playlist, psz_uri, psz_uri, PLAYLIST_APPEND, PLAYLIST_END ); diff -Nur --exclude po vlc-0.8.6d/modules/gui/pda/Makefile.in vlc-0.8.6e/modules/gui/pda/Makefile.in --- vlc-0.8.6d/modules/gui/pda/Makefile.in 2007-11-28 06:23:29.000000000 +1100 +++ vlc-0.8.6e/modules/gui/pda/Makefile.in 2008-02-25 06:07:31.000000000 +1100 @@ -187,6 +187,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -281,6 +282,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/qnx/Makefile.in vlc-0.8.6e/modules/gui/qnx/Makefile.in --- vlc-0.8.6d/modules/gui/qnx/Makefile.in 2007-11-28 06:23:30.000000000 +1100 +++ vlc-0.8.6e/modules/gui/qnx/Makefile.in 2008-02-25 06:07:31.000000000 +1100 @@ -178,6 +178,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -272,6 +273,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/skins2/Makefile.in vlc-0.8.6e/modules/gui/skins2/Makefile.in --- vlc-0.8.6d/modules/gui/skins2/Makefile.in 2007-11-28 06:23:34.000000000 +1100 +++ vlc-0.8.6e/modules/gui/skins2/Makefile.in 2008-02-25 06:07:34.000000000 +1100 @@ -575,6 +575,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -669,6 +670,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/wince/Makefile.in vlc-0.8.6e/modules/gui/wince/Makefile.in --- vlc-0.8.6d/modules/gui/wince/Makefile.in 2007-11-28 06:23:35.000000000 +1100 +++ vlc-0.8.6e/modules/gui/wince/Makefile.in 2008-02-25 06:07:34.000000000 +1100 @@ -223,6 +223,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -317,6 +318,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/gui/wxwidgets/interface.cpp vlc-0.8.6e/modules/gui/wxwidgets/interface.cpp --- vlc-0.8.6d/modules/gui/wxwidgets/interface.cpp 2007-11-28 06:22:17.000000000 +1100 +++ vlc-0.8.6e/modules/gui/wxwidgets/interface.cpp 2008-01-18 08:31:50.000000000 +1100 @@ -2,7 +2,7 @@ * interface.cpp : wxWidgets plugin for vlc ***************************************************************************** * Copyright (C) 2000-2006 the VideoLAN team - * $Id: interface.cpp 23379 2007-11-27 19:10:16Z fkuehne $ + * $Id: interface.cpp 24300 2008-01-14 20:17:23Z Trax $ * * Authors: Gildas Bazin * @@ -936,9 +936,9 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) ) { wxString msg; - msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) + + msg.Printf( wxString(wxT("VLC media player " VERSION_MESSAGE)) + wxU(_(" (wxWidgets interface)\n\n")) + - wxU(_("(c) 1996-2006 - the VideoLAN Team\n\n")) + + wxU(_("(c) " COPYRIGHT_YEARS " - the VideoLAN Team\n\n")) + wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") + wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") + wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") + diff -Nur --exclude po vlc-0.8.6d/modules/gui/wxwidgets/Makefile.in vlc-0.8.6e/modules/gui/wxwidgets/Makefile.in --- vlc-0.8.6d/modules/gui/wxwidgets/Makefile.in 2007-11-28 06:23:36.000000000 +1100 +++ vlc-0.8.6e/modules/gui/wxwidgets/Makefile.in 2008-02-25 06:07:35.000000000 +1100 @@ -296,6 +296,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -390,6 +391,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/Makefile.in vlc-0.8.6e/modules/Makefile.in --- vlc-0.8.6d/modules/Makefile.in 2007-11-28 06:23:02.000000000 +1100 +++ vlc-0.8.6e/modules/Makefile.in 2008-02-25 06:07:12.000000000 +1100 @@ -127,6 +127,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -221,6 +222,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/misc/dummy/Makefile.in vlc-0.8.6e/modules/misc/dummy/Makefile.in --- vlc-0.8.6d/modules/misc/dummy/Makefile.in 2007-11-28 06:23:38.000000000 +1100 +++ vlc-0.8.6e/modules/misc/dummy/Makefile.in 2008-02-25 06:07:37.000000000 +1100 @@ -194,6 +194,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -288,6 +289,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/misc/Makefile.in vlc-0.8.6e/modules/misc/Makefile.in --- vlc-0.8.6d/modules/misc/Makefile.in 2007-11-28 06:23:38.000000000 +1100 +++ vlc-0.8.6e/modules/misc/Makefile.in 2008-02-25 06:07:36.000000000 +1100 @@ -519,6 +519,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -613,6 +614,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/misc/memcpy/Makefile.in vlc-0.8.6e/modules/misc/memcpy/Makefile.in --- vlc-0.8.6d/modules/misc/memcpy/Makefile.in 2007-11-28 06:23:39.000000000 +1100 +++ vlc-0.8.6e/modules/misc/memcpy/Makefile.in 2008-02-25 06:07:37.000000000 +1100 @@ -288,6 +288,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -382,6 +383,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/misc/network/Makefile.in vlc-0.8.6e/modules/misc/network/Makefile.in --- vlc-0.8.6d/modules/misc/network/Makefile.in 2007-11-28 06:23:39.000000000 +1100 +++ vlc-0.8.6e/modules/misc/network/Makefile.in 2008-02-25 06:07:38.000000000 +1100 @@ -196,6 +196,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -290,6 +291,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/misc/playlist/Makefile.in vlc-0.8.6e/modules/misc/playlist/Makefile.in --- vlc-0.8.6d/modules/misc/playlist/Makefile.in 2007-11-28 06:23:40.000000000 +1100 +++ vlc-0.8.6e/modules/misc/playlist/Makefile.in 2008-02-25 06:07:38.000000000 +1100 @@ -184,6 +184,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -278,6 +279,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/misc/testsuite/Makefile.in vlc-0.8.6e/modules/misc/testsuite/Makefile.in --- vlc-0.8.6d/modules/misc/testsuite/Makefile.in 2007-11-28 06:23:41.000000000 +1100 +++ vlc-0.8.6e/modules/misc/testsuite/Makefile.in 2008-02-25 06:07:38.000000000 +1100 @@ -285,6 +285,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -379,6 +380,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/misc/xml/Makefile.in vlc-0.8.6e/modules/misc/xml/Makefile.in --- vlc-0.8.6d/modules/misc/xml/Makefile.in 2007-11-28 06:23:41.000000000 +1100 +++ vlc-0.8.6e/modules/misc/xml/Makefile.in 2008-02-25 06:07:39.000000000 +1100 @@ -196,6 +196,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -290,6 +291,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/mux/Makefile.in vlc-0.8.6e/modules/mux/Makefile.in --- vlc-0.8.6d/modules/mux/Makefile.in 2007-11-28 06:23:42.000000000 +1100 +++ vlc-0.8.6e/modules/mux/Makefile.in 2008-02-25 06:07:39.000000000 +1100 @@ -323,6 +323,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -417,6 +418,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/mux/mp4.c vlc-0.8.6e/modules/mux/mp4.c --- vlc-0.8.6d/modules/mux/mp4.c 2007-11-27 00:08:07.000000000 +1100 +++ vlc-0.8.6e/modules/mux/mp4.c 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * mp4.c: mp4/mov muxer ***************************************************************************** * Copyright (C) 2001, 2002, 2003, 2006 the VideoLAN team - * $Id: mp4.c 16767 2006-09-21 14:32:45Z hartman $ + * $Id: mp4.c 24243 2008-01-11 20:34:57Z Trax $ * * Authors: Laurent Aimar * Gildas Bazin @@ -195,7 +195,7 @@ sout_mux_sys_t *p_sys; bo_t *box; - msg_Dbg( p_mux, "Mp4 muxer opend" ); + msg_Dbg( p_mux, "Mp4 muxer opened" ); sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg ); p_mux->pf_control = Control; @@ -724,6 +724,7 @@ tk->avc.i_profile = tk->avc.sps[1]; tk->avc.i_profile = tk->avc.sps[2]; + tk->avc.i_profile_compat = tk->avc.sps[2]; tk->avc.i_level = tk->avc.sps[3]; } else if( (last[4]&0x1f) == 8 && tk->avc.i_pps <= 0 ) /* PPS */ diff -Nur --exclude po vlc-0.8.6d/modules/mux/mpeg/Makefile.in vlc-0.8.6e/modules/mux/mpeg/Makefile.in --- vlc-0.8.6d/modules/mux/mpeg/Makefile.in 2007-11-28 06:23:42.000000000 +1100 +++ vlc-0.8.6e/modules/mux/mpeg/Makefile.in 2008-02-25 06:07:40.000000000 +1100 @@ -206,6 +206,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -300,6 +301,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/mux/rtp/Makefile.in vlc-0.8.6e/modules/mux/rtp/Makefile.in --- vlc-0.8.6d/modules/mux/rtp/Makefile.in 2007-11-28 06:23:43.000000000 +1100 +++ vlc-0.8.6e/modules/mux/rtp/Makefile.in 2008-02-25 06:07:40.000000000 +1100 @@ -174,6 +174,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -268,6 +269,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/packetizer/h264.c vlc-0.8.6e/modules/packetizer/h264.c --- vlc-0.8.6d/modules/packetizer/h264.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/packetizer/h264.c 2008-01-20 00:59:11.000000000 +1100 @@ -1,8 +1,8 @@ /***************************************************************************** * h264.c: h264/avc video packetizer ***************************************************************************** - * Copyright (C) 2001, 2002, 2006 the VideoLAN team - * $Id: h264.c 19603 2007-04-01 01:19:51Z hartman $ + * Copyright (C) 2001-2008 the VideoLAN team + * $Id: h264.c 24384 2008-01-18 10:13:07Z jpsaman $ * * Authors: Laurent Aimar * Eric Petit @@ -245,13 +245,17 @@ /* FIXME: FFMPEG isn't happy at all if you leave this */ if( p_dec->fmt_out.i_extra ) free( p_dec->fmt_out.p_extra ); p_dec->fmt_out.i_extra = 0; p_dec->fmt_out.p_extra = NULL; - + /* Set the new extradata */ p_dec->fmt_out.i_extra = p_sys->p_pps->i_buffer + p_sys->p_sps->i_buffer; p_dec->fmt_out.p_extra = (uint8_t*)malloc( p_dec->fmt_out.i_extra ); - memcpy( (uint8_t*)p_dec->fmt_out.p_extra, p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer); - memcpy( (uint8_t*)p_dec->fmt_out.p_extra+p_sys->p_sps->i_buffer, p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer); - p_sys->b_header = VLC_TRUE; + if( p_dec->fmt_out.p_extra ) + { + memcpy( (uint8_t*)p_dec->fmt_out.p_extra, p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer); + memcpy( (uint8_t*)p_dec->fmt_out.p_extra+p_sys->p_sps->i_buffer, p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer); + p_sys->b_header = VLC_TRUE; + } + else p_dec->fmt_out.i_extra = 0; /* Set callback */ p_dec->pf_packetize = PacketizeAVC1; @@ -261,7 +265,7 @@ /* This type of stream contains data with 3 of 4 byte startcodes * The fmt_in.p_extra MAY contain SPS/PPS with 4 byte startcodes * The fmt_out.p_extra should be the same */ - + /* Set callback */ p_dec->pf_packetize = Packetize; @@ -310,7 +314,25 @@ decoder_sys_t *p_sys = p_dec->p_sys; block_t *p_pic; - if( !pp_block || !*pp_block ) return NULL; + if( !pp_block || !*pp_block ) + return NULL; + + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) + { + p_sys->i_state = STATE_NOSYNC; + block_BytestreamFlush( &p_sys->bytestream ); + + if( p_sys->p_frame ) + block_ChainRelease( p_sys->p_frame ); + p_sys->p_frame = NULL; + p_sys->slice.i_frame_type = 0; + p_sys->b_slice = VLC_FALSE; + } + block_Release( *pp_block ); + return NULL; + } block_BytestreamPush( &p_sys->bytestream, *pp_block ); @@ -399,7 +421,13 @@ block_t *p_ret = NULL; uint8_t *p; - if( !pp_block || !*pp_block ) return NULL; + if( !pp_block || !*pp_block ) + return NULL; + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + block_Release( *pp_block ); + return NULL; + } p_block = *pp_block; *pp_block = NULL; @@ -461,21 +489,24 @@ *pp_ret = dst; - while( src < end ) + if( dst ) { - if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 && - src[2] == 0x03 ) + while( src < end ) { - *dst++ = 0x00; - *dst++ = 0x00; + if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 && + src[2] == 0x03 ) + { + *dst++ = 0x00; + *dst++ = 0x00; - src += 3; - continue; + src += 3; + continue; + } + *dst++ = *src++; } - *dst++ = *src++; - } - *pi_ret = dst - *pp_ret; + *pi_ret = dst - *pp_ret; + } } static inline int bs_read_ue( bs_t *s ) @@ -496,7 +527,6 @@ return val&0x01 ? (val+1)/2 : -(val/2); } - /***************************************************************************** * ParseNALBlock: parses annexB type NALs * All p_frag blocks are required to start with 0 0 0 1 4-byte startcode @@ -514,7 +544,7 @@ if( !p_sys->b_header && p_sys->slice.i_frame_type != BLOCK_FLAG_TYPE_I) \ break; \ \ - if( p_sys->slice.i_frame_type == BLOCK_FLAG_TYPE_I && p_sys->p_sps && p_sys->p_pps && !p_sys->b_header ) \ + if( p_sys->slice.i_frame_type == BLOCK_FLAG_TYPE_I && p_sys->p_sps && p_sys->p_pps ) \ { \ block_t *p_sps = block_Duplicate( p_sys->p_sps ); \ block_t *p_pps = block_Duplicate( p_sys->p_pps ); \ @@ -554,8 +584,8 @@ } else if( i_nal_type >= NAL_SLICE && i_nal_type <= NAL_SLICE_IDR ) { - uint8_t *dec; - int i_dec, i_first_mb, i_slice_type; + uint8_t *dec = NULL; + int i_dec = 0, i_first_mb, i_slice_type; slice_t slice; vlc_bool_t b_pic; bs_t s; @@ -637,7 +667,9 @@ slice.i_field_pic_flag != p_sys->slice.i_field_pic_flag || slice.i_nal_ref_idc != p_sys->slice.i_nal_ref_idc ) b_pic = VLC_TRUE; - if( slice.i_bottom_field_flag != -1 && p_sys->slice.i_bottom_field_flag != -1 && slice.i_bottom_field_flag != p_sys->slice.i_bottom_field_flag ) + if( slice.i_bottom_field_flag != -1 && + p_sys->slice.i_bottom_field_flag != -1 && + slice.i_bottom_field_flag != p_sys->slice.i_bottom_field_flag ) b_pic = VLC_TRUE; if( p_sys->i_pic_order_cnt_type == 0 && ( slice.i_pic_order_cnt_lsb != p_sys->slice.i_pic_order_cnt_lsb || @@ -663,8 +695,8 @@ } else if( i_nal_type == NAL_SPS ) { - uint8_t *dec; - int i_dec; + uint8_t *dec = NULL; + int i_dec = 0; bs_t s; int i_tmp; diff -Nur --exclude po vlc-0.8.6d/modules/packetizer/Makefile.in vlc-0.8.6e/modules/packetizer/Makefile.in --- vlc-0.8.6d/modules/packetizer/Makefile.in 2007-11-28 06:23:43.000000000 +1100 +++ vlc-0.8.6e/modules/packetizer/Makefile.in 2008-02-25 06:07:40.000000000 +1100 @@ -305,6 +305,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -399,6 +400,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/services_discovery/Makefile.in vlc-0.8.6e/modules/services_discovery/Makefile.in --- vlc-0.8.6d/modules/services_discovery/Makefile.in 2007-11-28 06:23:44.000000000 +1100 +++ vlc-0.8.6e/modules/services_discovery/Makefile.in 2008-02-25 06:07:41.000000000 +1100 @@ -342,6 +342,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -436,6 +437,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/stream_out/Makefile.in vlc-0.8.6e/modules/stream_out/Makefile.in --- vlc-0.8.6d/modules/stream_out/Makefile.in 2007-11-28 06:23:46.000000000 +1100 +++ vlc-0.8.6e/modules/stream_out/Makefile.in 2008-02-25 06:07:42.000000000 +1100 @@ -516,6 +516,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -610,6 +611,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/stream_out/transrate/Makefile.in vlc-0.8.6e/modules/stream_out/transrate/Makefile.in --- vlc-0.8.6d/modules/stream_out/transrate/Makefile.in 2007-11-28 06:23:46.000000000 +1100 +++ vlc-0.8.6e/modules/stream_out/transrate/Makefile.in 2008-02-25 06:07:42.000000000 +1100 @@ -191,6 +191,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -285,6 +286,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_chroma/Makefile.in vlc-0.8.6e/modules/video_chroma/Makefile.in --- vlc-0.8.6d/modules/video_chroma/Makefile.in 2007-11-28 06:23:47.000000000 +1100 +++ vlc-0.8.6e/modules/video_chroma/Makefile.in 2008-02-25 06:07:43.000000000 +1100 @@ -428,6 +428,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -522,6 +523,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_filter/Makefile.in vlc-0.8.6e/modules/video_filter/Makefile.in --- vlc-0.8.6d/modules/video_filter/Makefile.in 2007-11-28 06:23:49.000000000 +1100 +++ vlc-0.8.6e/modules/video_filter/Makefile.in 2008-02-25 06:07:44.000000000 +1100 @@ -619,6 +619,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -713,6 +714,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_filter/swscale/Makefile.in vlc-0.8.6e/modules/video_filter/swscale/Makefile.in --- vlc-0.8.6d/modules/video_filter/swscale/Makefile.in 2007-11-28 06:23:50.000000000 +1100 +++ vlc-0.8.6e/modules/video_filter/swscale/Makefile.in 2008-02-25 06:07:45.000000000 +1100 @@ -188,6 +188,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -282,6 +283,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_output/directx/Makefile.in vlc-0.8.6e/modules/video_output/directx/Makefile.in --- vlc-0.8.6d/modules/video_output/directx/Makefile.in 2007-11-28 06:23:52.000000000 +1100 +++ vlc-0.8.6e/modules/video_output/directx/Makefile.in 2008-02-25 06:07:46.000000000 +1100 @@ -242,6 +242,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -336,6 +337,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_output/Makefile.in vlc-0.8.6e/modules/video_output/Makefile.in --- vlc-0.8.6d/modules/video_output/Makefile.in 2007-11-28 06:23:51.000000000 +1100 +++ vlc-0.8.6e/modules/video_output/Makefile.in 2008-02-25 06:07:46.000000000 +1100 @@ -500,6 +500,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -594,6 +595,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_output/opengl.c vlc-0.8.6e/modules/video_output/opengl.c --- vlc-0.8.6d/modules/video_output/opengl.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/video_output/opengl.c 2008-01-18 08:31:51.000000000 +1100 @@ -2,7 +2,7 @@ * opengl.c: OpenGL video output ***************************************************************************** * Copyright (C) 2004-2006 the VideoLAN team - * $Id: opengl.c 19582 2007-03-31 23:56:53Z hartman $ + * $Id: opengl.c 24165 2008-01-07 14:48:17Z fkuehne $ * * Authors: Cyril Deguet * Gildas Bazin @@ -37,6 +37,7 @@ #ifdef __APPLE__ #include #include +#include /* On OS X, use GL_TEXTURE_RECTANGLE_EXT instead of GL_TEXTURE_2D. This allows sizes which are not powers of 2 */ @@ -238,6 +239,31 @@ vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_sys_t *p_sys; + /* we may not use the OpenGL module on Mac OS X releases earlier to 10.4 + * because otherwise we won't get correct fullscreen output. + * Since 10.3.9 is PowerPC-only, we are doing some strange stuff here. + * Note that the following code requires the Carbon framework */ +#ifdef __APPLE__ +#ifndef __i386__ +#ifndef __x86_64__ + long minorMacVersion; + if( Gestalt( gestaltSystemVersionMinor, &minorMacVersion ) == noErr ) + { + if( minorMacVersion < 4 ) + { + msg_Warn( p_vout, "current osx version is 10.%ld, non-suitable for OpenGL-based video output", minorMacVersion ); + return VLC_ENOOBJ; + } + } + else + { + msg_Warn( p_vout, "couldn't get OS version" ); + return VLC_EGENERIC; + } +#endif +#endif +#endif + /* Allocate structure */ p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) ); if( p_sys == NULL ) diff -Nur --exclude po vlc-0.8.6d/modules/video_output/qte/Makefile.in vlc-0.8.6e/modules/video_output/qte/Makefile.in --- vlc-0.8.6d/modules/video_output/qte/Makefile.in 2007-11-28 06:23:52.000000000 +1100 +++ vlc-0.8.6e/modules/video_output/qte/Makefile.in 2008-02-25 06:07:46.000000000 +1100 @@ -183,6 +183,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -277,6 +278,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_output/x11/Makefile.in vlc-0.8.6e/modules/video_output/x11/Makefile.in --- vlc-0.8.6d/modules/video_output/x11/Makefile.in 2007-11-28 06:23:53.000000000 +1100 +++ vlc-0.8.6e/modules/video_output/x11/Makefile.in 2008-02-25 06:07:47.000000000 +1100 @@ -231,6 +231,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -325,6 +326,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/video_output/x11/xcommon.c vlc-0.8.6e/modules/video_output/x11/xcommon.c --- vlc-0.8.6d/modules/video_output/x11/xcommon.c 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/video_output/x11/xcommon.c 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * xcommon.c: Functions common to the X11 and XVideo plugins ***************************************************************************** * Copyright (C) 1998-2006 the VideoLAN team - * $Id: xcommon.c 19347 2007-03-17 21:21:26Z sam $ + * $Id: xcommon.c 25069 2008-02-10 12:14:17Z courmisch $ * * Authors: Vincent Seguin * Sam Hocevar @@ -107,7 +107,7 @@ #ifdef HAVE_SYS_SHM_H static IMAGE_TYPE *CreateShmImage ( vout_thread_t *, Display *, EXTRA_ARGS_SHM, int, int ); -static vlc_bool_t b_shm = VLC_TRUE; +static int i_shm_major = 0; #endif static void ToggleFullScreen ( vout_thread_t * ); @@ -507,7 +507,7 @@ vlc_mutex_lock( &p_vout->p_sys->lock ); #ifdef HAVE_SYS_SHM_H - if( p_vout->p_sys->b_shm ) + if( p_vout->p_sys->i_shm_opcode ) { /* Display rendered image using shared memory extension */ # ifdef MODULE_NAME_IS_xvideo @@ -1322,7 +1322,7 @@ p_vout->output.i_aspect ); #ifdef HAVE_SYS_SHM_H - if( p_vout->p_sys->b_shm ) + if( p_vout->p_sys->i_shm_opcode ) { /* Create image using XShm extension */ p_pic->p_sys->p_image = @@ -1338,7 +1338,7 @@ p_vout->output.i_width, p_vout->output.i_height ); } - if( !p_vout->p_sys->b_shm || !p_pic->p_sys->p_image ) + if( !p_vout->p_sys->i_shm_opcode || !p_pic->p_sys->p_image ) #endif /* HAVE_SYS_SHM_H */ { /* Create image without XShm extension */ @@ -1356,10 +1356,10 @@ p_vout->output.i_width, p_vout->output.i_height ); #ifdef HAVE_SYS_SHM_H - if( p_pic->p_sys->p_image && p_vout->p_sys->b_shm ) + if( p_pic->p_sys->p_image && p_vout->p_sys->i_shm_opcode ) { msg_Warn( p_vout, "couldn't create SHM image, disabling SHM" ); - p_vout->p_sys->b_shm = VLC_FALSE; + p_vout->p_sys->i_shm_opcode = 0; } #endif /* HAVE_SYS_SHM_H */ } @@ -1449,7 +1449,7 @@ { /* The order of operations is correct */ #ifdef HAVE_SYS_SHM_H - if( p_vout->p_sys->b_shm ) + if( p_vout->p_sys->i_shm_opcode ) { XShmDetach( p_vout->p_sys->p_display, &p_pic->p_sys->shminfo ); IMAGE_FREE( p_pic->p_sys->p_image ); @@ -2032,18 +2032,36 @@ #endif #ifdef HAVE_SYS_SHM_H - p_vout->p_sys->b_shm = 0; + p_vout->p_sys->i_shm_opcode = 0; if( config_GetInt( p_vout, MODULE_STRING "-shm" ) ) { # ifdef __APPLE__ /* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */ # else - p_vout->p_sys->b_shm = - ( XShmQueryExtension( p_vout->p_sys->p_display ) == True ); + int major, evt, err; + + if( XQueryExtension( p_vout->p_sys->p_display, "MIT-SHM", &major, + &evt, &err ) + && XShmQueryExtension( p_vout->p_sys->p_display ) ) + p_vout->p_sys->i_shm_opcode = major; + + if( p_vout->p_sys->i_shm_opcode ) + { + int major, minor; + Bool pixmaps; + + XShmQueryVersion( p_vout->p_sys->p_display, &major, &minor, + &pixmaps ); + msg_Dbg( p_vout, "XShm video extension v%d.%d " + "(with%s pixmaps, opcode: %d)", + major, minor, pixmaps ? "" : "out", + p_vout->p_sys->i_shm_opcode ); + } + # endif - if( !p_vout->p_sys->b_shm ) + if( !p_vout->p_sys->i_shm_opcode ) { msg_Warn( p_vout, "XShm video extension is unavailable" ); } @@ -2222,9 +2240,9 @@ /* Attach shared memory segment to X server */ XSynchronize( p_display, True ); - b_shm = VLC_TRUE; + i_shm_major = p_vout->p_sys->i_shm_opcode; result = XShmAttach( p_display, p_shm ); - if( result == False || !b_shm ) + if( result == False || !i_shm_major ) { msg_Err( p_vout, "cannot attach shared memory to X server" ); IMAGE_FREE( p_image ); @@ -2329,17 +2347,11 @@ /* Ingnore errors on XSetInputFocus() * (they happen when a window is not yet mapped) */ return 0; - - case 150: /* MIT-SHM */ - case 146: /* MIT-SHM too, what gives? */ - if( event->minor_code == X_ShmAttach ) - { - b_shm = VLC_FALSE; - return 0; - } - break; } + if( event->request_code == i_shm_major ) /* MIT-SHM */ + return i_shm_major = 0; + XSetErrorHandler(NULL); return (XSetErrorHandler(X11ErrorHandler))( display, event ); } diff -Nur --exclude po vlc-0.8.6d/modules/video_output/x11/xcommon.h vlc-0.8.6e/modules/video_output/x11/xcommon.h --- vlc-0.8.6d/modules/video_output/x11/xcommon.h 2007-11-27 00:08:06.000000000 +1100 +++ vlc-0.8.6e/modules/video_output/x11/xcommon.h 2008-02-25 06:01:53.000000000 +1100 @@ -2,7 +2,7 @@ * xcommon.h: Defines common to the X11 and XVideo plugins ***************************************************************************** * Copyright (C) 1998-2001 the VideoLAN team - * $Id: xcommon.h 19298 2007-03-11 15:54:09Z courmisch $ + * $Id: xcommon.h 25069 2008-02-10 12:14:17Z courmisch $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -103,7 +103,7 @@ /* X11 generic properties */ vlc_bool_t b_altfullscreen; /* which fullscreen method */ #ifdef HAVE_SYS_SHM_H - vlc_bool_t b_shm; /* shared memory extension flag */ + int i_shm_opcode; /* shared memory extension opcode */ #endif #ifdef MODULE_NAME_IS_xvideo diff -Nur --exclude po vlc-0.8.6d/modules/visualization/galaktos/Makefile.in vlc-0.8.6e/modules/visualization/galaktos/Makefile.in --- vlc-0.8.6d/modules/visualization/galaktos/Makefile.in 2007-11-28 06:23:54.000000000 +1100 +++ vlc-0.8.6e/modules/visualization/galaktos/Makefile.in 2008-02-25 06:07:48.000000000 +1100 @@ -247,6 +247,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -341,6 +342,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/visualization/Makefile.in vlc-0.8.6e/modules/visualization/Makefile.in --- vlc-0.8.6d/modules/visualization/Makefile.in 2007-11-28 06:23:53.000000000 +1100 +++ vlc-0.8.6e/modules/visualization/Makefile.in 2008-02-25 06:07:47.000000000 +1100 @@ -196,6 +196,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -290,6 +291,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/modules/visualization/visual/Makefile.in vlc-0.8.6e/modules/visualization/visual/Makefile.in --- vlc-0.8.6d/modules/visualization/visual/Makefile.in 2007-11-28 06:23:55.000000000 +1100 +++ vlc-0.8.6e/modules/visualization/visual/Makefile.in 2008-02-25 06:07:48.000000000 +1100 @@ -179,6 +179,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -273,6 +274,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/mozilla/control/npolibvlc.cpp vlc-0.8.6e/mozilla/control/npolibvlc.cpp --- vlc-0.8.6d/mozilla/control/npolibvlc.cpp 2007-11-27 00:08:12.000000000 +1100 +++ vlc-0.8.6e/mozilla/control/npolibvlc.cpp 2008-02-25 06:01:54.000000000 +1100 @@ -1373,7 +1373,7 @@ } else if( NPVARIANT_IS_STRING(args[1]) ) { - name = stringValue(NPVARIANT_TO_STRING(args[0])); + name = stringValue(NPVARIANT_TO_STRING(args[1])); } else { diff -Nur --exclude po vlc-0.8.6d/mozilla/Makefile.in vlc-0.8.6e/mozilla/Makefile.in --- vlc-0.8.6d/mozilla/Makefile.in 2007-11-28 06:23:55.000000000 +1100 +++ vlc-0.8.6e/mozilla/Makefile.in 2008-02-25 06:07:49.000000000 +1100 @@ -196,6 +196,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -290,6 +291,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/msvc/config.h vlc-0.8.6e/msvc/config.h --- vlc-0.8.6d/msvc/config.h 2007-11-28 09:16:41.000000000 +1100 +++ vlc-0.8.6e/msvc/config.h 2008-02-28 05:41:36.000000000 +1100 @@ -4,7 +4,7 @@ #define CONFIGURE_LINE "Visual C++" /* Copyright string */ -#define COPYRIGHT_MESSAGE "VLC media player - version 0.8.6d Janus - (c) 1996-2004 VideoLAN" +#define COPYRIGHT_MESSAGE "VLC media player - version 0.8.6e Janus - (c) 1996-2004 VideoLAN" /* Maximum supported data alignment */ #define ATTRIBUTE_ALIGNED_MAX 16 @@ -115,10 +115,10 @@ #define LIBEXT ".dll" /* String suffix for module functions */ -#define MODULE_SUFFIX "__0_8_6d" +#define MODULE_SUFFIX "__0_8_6e" /* Symbol suffix for module functions */ -#define MODULE_SYMBOL 0_8_6d +#define MODULE_SYMBOL 0_8_6e /* Name of package */ #define PACKAGE "vlc" @@ -130,13 +130,13 @@ #define PACKAGE_NAME "vlc" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "vlc 0.8.6d" +#define PACKAGE_STRING "vlc 0.8.6e" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "vlc" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.8.6d" +#define PACKAGE_VERSION "0.8.6e" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -145,10 +145,10 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION "0.8.6d" +#define VERSION "0.8.6e" /* Simple version string */ -#define VERSION_MESSAGE "0.8.6d Janus" +#define VERSION_MESSAGE "0.8.6e Janus" /* compiler */ #define VLC_COMPILER "Microsoft Visual C++" diff -Nur --exclude po vlc-0.8.6d/NEWS vlc-0.8.6e/NEWS --- vlc-0.8.6d/NEWS 2007-11-28 06:22:18.000000000 +1100 +++ vlc-0.8.6e/NEWS 2008-02-28 05:27:36.000000000 +1100 @@ -1,7 +1,48 @@ -$Id: NEWS 23380 2007-11-27 19:17:20Z fkuehne $ +$Id: NEWS 25364 2008-02-27 00:14:14Z thresh $ + +Changes between 0.8.6d and 0.8.6e: +---------------------------------- + +Various bugfixes: + * Resume playback for viewing content over FTP + * Fixed XShm detection with remote X11 + +Security updates: + * Subtitle demuxers overflow (CVE-2007-6681) + * HTTP listener format string injection (CVE-2007-6682) + * Fixed buffer overflow in the SDL_image library (CVE-2006-4484) + * Real RTSP overflows (CVE-2008-0225, CVE-2008-0295, CVE-2008-0296, VideoLAN-SA-0801) + * Arbitrary memory overwrite in the MP4 demuxer (CORE-2008-0130, VideoLAN-SA-0802) + +Audio filter: + * Fixed DTS to S/PDIF converter + +Audio output: + * Fixed 5.1 audio on ALSA + +Access: + * Fixed some RTSP hanging and user/password passing through RTSP URLs + +Stream output: + * Fixed waiting for SPS/PPS problem in H.264 packetizer + +Encoders: + * Improved compatibility for creating H.264 video files playable on iPhones + * Improved detection of optimal amount of threads for multi-threaded H.264 encoding on multi-cpu systems + - Note that this is used when transcode threads is set to 0 (default) + - Not supported on Windows (multiple threads require manual configuration) + +Mac OS X Interface & Port: + * Restored compatibility with Mac OS X 10.3.9 + * Corrected behavior of the Preferences panel + * VLC no longer crashes on quit while playing + +Localization: + * Updated Romanian and Polish translations + Changes between 0.8.6c and 0.8.6d: ----------------------------------------------------------- +---------------------------------- Various bugfixes: * Mozilla plugin: supports a reasonable amount of MIME types on Windows @@ -14,7 +55,7 @@ * FLAC Security Update (CVE-2007-4619) to prevent multiple integer overflows Active X plugin: - * Security update (VideoLAN-SA-0703) + * Security update (VideoLAN-SA-0703, CVE-2007-6262) Mac OS X Interface & Port: * Apple Remote support on Mac OS X 10.5 Leopard with enhanced functionality @@ -30,7 +71,8 @@ Other changes: * The automatic updating facility was removed * You now need to append --m3u-extvlcopt to your command line to enable - EXTVLCOPT options parsing in m3u playlists. + EXTVLCOPT options parsing in m3u playlists (CVE-2007-6683) + * RTSP server remote denial of service fixed (CVE-2007-6684) Changes between 0.8.6b and 0.8.6c: @@ -45,10 +87,11 @@ * MKV demuxer crash (related to seeking) CDDA / Vorbis / Theora / SAP plugins: - * Security updates (VideoLAN-SA-0702, CVE-2007-3316) + * Security updates (VideoLAN-SA-0702, CVE-2007-3316, US-CERT VU#200928) Demuxers: * Fixed a problem with detecting embedded subtitles (GAB2 format) in AVI + * Prevent WAV file integer overflow (CVE-2007-3467 & CVE-2007-3468) Decoders: * Updated FLAC API compatibility @@ -89,7 +132,7 @@ --------------------------------- CDDA / VCDX plugins: - * Security updates (VideoLAN-SA-0701) + * Security updates (VideoLAN-SA-0701, CVE-2007-0017) Mac OS X Interface: * Fullscreen controller improvements @@ -143,12 +186,12 @@ Windows port: * Support for Unicode filenames (Windows NT and above) Windows 9x/ME users: - - Please note that these versions of Windows are not officially supported - - Unicode support for Windows 9x/ME applications is available through the - Microsoft Layer for Unicode available from the following location: - http://www.microsoft.com.nsatc.net/globaldev/handson/dev/mslu_announce.mspx - Download the MSLU package (unicows) and extract the content into the folder - C:\Windows\System + - Please note that these versions of Windows are not officially supported + - Unicode support for Windows 9x/ME applications is available through the + Microsoft Layer for Unicode available from the following location: + http://www.microsoft.com.nsatc.net/globaldev/handson/dev/mslu_announce.mspx + Download the MSLU package (unicows) and extract the content into the folder + C:\Windows\System * Fixed IPv6 support on the client side * Fixed disable screensaver (Direct3D and DirectX video output) @@ -175,8 +218,8 @@ * Initial support for RTSP-over-HTTP (to allow NAT traversal) * Linux DV (Digital Video - Firewire) input * Improvements to the Audio CD input - - Separate playlist entries for the tracks - - Support for CDDB + - Separate playlist entries for the tracks + - Support for CDDB * Support for more DVB (satellite) encryption modules * Improved subtitles encoding support * Improved support for playing MP4 files from the Web diff -Nur --exclude po vlc-0.8.6d/share/Makefile.in vlc-0.8.6e/share/Makefile.in --- vlc-0.8.6d/share/Makefile.in 2007-11-28 06:23:56.000000000 +1100 +++ vlc-0.8.6e/share/Makefile.in 2008-02-25 06:07:49.000000000 +1100 @@ -135,6 +135,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -229,6 +230,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/src/Makefile.in vlc-0.8.6e/src/Makefile.in --- vlc-0.8.6d/src/Makefile.in 2007-11-28 06:23:58.000000000 +1100 +++ vlc-0.8.6e/src/Makefile.in 2008-02-25 06:07:50.000000000 +1100 @@ -432,6 +432,7 @@ DIRAC_CFLAGS = @DIRAC_CFLAGS@ DIRAC_LIBS = @DIRAC_LIBS@ DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ DVDNAV_CONFIG = @DVDNAV_CONFIG@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ @@ -526,6 +527,7 @@ MOZILLA_SDK_PATH = @MOZILLA_SDK_PATH@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NMEDIT = @NMEDIT@ NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ NOTIFY_LIBS = @NOTIFY_LIBS@ NSPR_CFLAGS = @NSPR_CFLAGS@ diff -Nur --exclude po vlc-0.8.6d/src/misc/version.c vlc-0.8.6e/src/misc/version.c --- vlc-0.8.6d/src/misc/version.c 2007-11-28 09:15:39.000000000 +1100 +++ vlc-0.8.6e/src/misc/version.c 2008-02-28 05:40:19.000000000 +1100 @@ -3,5 +3,5 @@ * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE * OFFICIAL VLC STABLE RELEASES. */ -const char psz_vlc_changeset[] = "23388"; +const char psz_vlc_changeset[] = "25377"; diff -Nur --exclude po vlc-0.8.6d/src/network/httpd.c vlc-0.8.6e/src/network/httpd.c --- vlc-0.8.6d/src/network/httpd.c 2007-11-27 00:07:58.000000000 +1100 +++ vlc-0.8.6e/src/network/httpd.c 2007-12-28 22:05:28.000000000 +1100 @@ -2,7 +2,7 @@ * httpd.c ***************************************************************************** * Copyright (C) 2004-2006 the VideoLAN team - * $Id: httpd.c 16774 2006-09-21 19:29:10Z hartman $ + * $Id: httpd.c 23854 2007-12-24 16:35:53Z courmisch $ * * Authors: Laurent Aimar * Rémi Denis-Courmont @@ -414,7 +414,7 @@ psz_connection = httpd_MsgGet( &cl->query, "Connection" ); if( psz_connection != NULL ) { - httpd_MsgAdd( answer, "Connection", psz_connection ); + httpd_MsgAdd( answer, "Connection", "%s", psz_connection ); } httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); diff -Nur --exclude po vlc-0.8.6d/THANKS vlc-0.8.6e/THANKS --- vlc-0.8.6d/THANKS 2007-11-27 00:08:12.000000000 +1100 +++ vlc-0.8.6e/THANKS 2008-02-25 06:01:55.000000000 +1100 @@ -1,4 +1,4 @@ -$Id: THANKS 23228 2007-11-21 22:00:20Z jpsaman $ +$Id: THANKS 25223 2008-02-21 08:51:03Z Trax $ VLC makes extensive use of the following persons' code: @@ -42,6 +42,7 @@ Christof Baumgaertner - dbox web intf Christophe Mutricy - many fixes (preferences, M3U, ...) Christopher Johnson - Qt fix in vlc.spec +Christopher Key - mp4 mux patch for h264 streaming to iPhone Colin Simmonds - compile fix for Mac OS X Damian Ivereigh - ac3dec uninitialized data structure fix Damien Fouilleul - DirectShow input improvements @@ -95,6 +96,7 @@ John Paul Lorenti - ALSA device selection patch Jonas Larsen - Danish translation Julien Blache - disc ejection code +Julien Robert - DTS to SPDIF fixes. Kang Jeong-Hee - Korean l10n kty0ne - WinAmp 5 skin for VLC Kevin H. Patterson - Theora framesize calculation patch by Kevin H. Patterson (kevpatt at khptech dot com @@ -112,6 +114,7 @@ Mathias C. Berens | welcome-soft - German translation Mathias Kretschmer - IP Multicast support Mats Rojestal - compilation fixes for Solaris 9 +Matthias P. Nowak - ALSA 5.1 fix Matthieu Lochegnies - MPEG audio emphasis fix Max Rudberg - Mac OS X controller art (v0.7.0) Michael Mondragon - ncurses compilation fix @@ -142,8 +145,7 @@ Rene Gollent - BeOS interface fix Roine Gustafsson - spudec bug fixes Rudolf Cornelissen - BeOS fixes -Scott Caudle - Visualization, WX -improvements +Scott Caudle - Visualization, WX improvements Sebastien Chaumat - YOPY port tests Simon Damkjær Andersen - playmode icons and the entire Fullscreen Panel design for the OS GUI (v0.8.6) Steve Lhomme - MSVC fixes and Matroska enhancements diff -Nur --exclude po vlc-0.8.6d/vlc.win32.nsi.in vlc-0.8.6e/vlc.win32.nsi.in --- vlc-0.8.6d/vlc.win32.nsi.in 2007-11-27 00:08:12.000000000 +1100 +++ vlc-0.8.6e/vlc.win32.nsi.in 2008-02-25 06:01:55.000000000 +1100 @@ -96,6 +96,8 @@ !insertmacro MUI_LANGUAGE "Russian" !insertmacro MUI_LANGUAGE "Portuguese" !insertmacro MUI_LANGUAGE "Arabic" + !insertmacro MUI_LANGUAGE "Polish" + !insertmacro MUI_LANGUAGE "Romanian" !insertmacro MUI_RESERVEFILE_LANGDLL