aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-19 20:02:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-19 20:05:11 +0100
commit8ea36711b0a85e24a77e1c76b1cb24aa63df217f (patch)
tree5699c8de8c2139e55c188a63a0bcb6f013895c83
parent43dc31f7469c873ccf3927c732a9c2d7d85360bb (diff)
parentec10a9ab461b26b96eff7bbbb8623f42d8ee04ad (diff)
downloadffmpeg-8ea36711b0a85e24a77e1c76b1cb24aa63df217f.tar.gz
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at> Not Pulled: commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2 Author: Mans Rullgard <mans@mansr.com> Date: Mon Feb 28 18:06:58 2011 +0000 Remove Sonic experimental audio codec commit 2912e87a6c9264d556734e2bf94a99c64cf9b102 Author: Mans Rullgard <mans@mansr.com> Date: Fri Mar 18 17:35:10 2011 +0000 Replace FFmpeg with Libav in licence headers
-rw-r--r--Doxyfile2
-rw-r--r--Makefile3
-rwxr-xr-xconfigure12
-rw-r--r--doc/developer.texi2
-rw-r--r--doc/faq.texi4
-rw-r--r--doc/general.texi2
-rw-r--r--libpostproc/postprocess.c2
-rwxr-xr-xtests/fate.sh2
-rwxr-xr-xversion.sh3
9 files changed, 12 insertions, 20 deletions
diff --git a/Doxyfile b/Doxyfile
index 1173836cb1..cadb158f1e 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -577,7 +577,7 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS = *.svn *.git *.d
+EXCLUDE_PATTERNS = *.git *.d
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/Makefile b/Makefile
index ad1f737ebb..cf8a481286 100644
--- a/Makefile
+++ b/Makefile
@@ -98,9 +98,8 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS)
VERSION_SH = $(SRC_PATH_BARE)/version.sh
GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
-SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
-.version: $(wildcard $(GIT_LOG) $(SVN_ENTRIES)) $(VERSION_SH) config.mak
+.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
.version: M=@
version.h .version:
diff --git a/configure b/configure
index 673c329566..0b6bdb63dd 100755
--- a/configure
+++ b/configure
@@ -2401,7 +2401,7 @@ case $target_os in
SLIBSUF=".dll"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
- SLIB_EXTRA_CMD='-lib.exe /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)'
+ SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)'
SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \
install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"; \
install -d "$(LIBDIR)"; \
@@ -2409,6 +2409,7 @@ case $target_os in
SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"'
SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
objformat="win32"
+ dlltool="${cross_prefix}dlltool"
enable dos_paths
check_cflags -fno-common
check_cpp_condition _mingw.h "defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) \
@@ -2879,11 +2880,7 @@ if enabled libdc1394; then
die "ERROR: No version of libdc1394 found "
fi
-SDL_CONFIG="${cross_prefix}sdl-config"
-if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
- sdl_cflags=$("${SDL_CONFIG}" --cflags)
- sdl_libs=$("${SDL_CONFIG}" --libs)
- check_func_headers SDL.h SDL_Init $sdl_cflags $sdl_libs &&
+if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
enable sdl &&
check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
@@ -3138,7 +3135,7 @@ echo
for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do
echo "Enabled ${type}s:"
eval list=\$$(toupper $type)_LIST
- print_enabled '_*' $list | sort | pr -3 -t
+ print_enabled '_*' $list | sort | pr -r -3 -t
echo
done
@@ -3232,6 +3229,7 @@ CPPFLAGS=$CPPFLAGS
CFLAGS=$CFLAGS
ASFLAGS=$ASFLAGS
CC_O=$CC_O
+DLLTOOL=$dlltool
LDFLAGS=$LDFLAGS
FFSERVERLDFLAGS=$FFSERVERLDFLAGS
SHFLAGS=$SHFLAGS
diff --git a/doc/developer.texi b/doc/developer.texi
index acffbe67e2..aedc4777bf 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -74,7 +74,7 @@ Indent size is 4.
The presentation is one inspired by 'indent -i4 -kr -nut'.
The TAB character is forbidden outside of Makefiles as is any
form of trailing whitespace. Commits containing either will be
-rejected by the Subversion repository.
+rejected by the git repository.
The main priority in FFmpeg is simplicity and small code size in order to
minimize the bug count.
diff --git a/doc/faq.texi b/doc/faq.texi
index b8a13b79eb..e034bc409f 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -23,7 +23,7 @@ help out creating them.
@section I have a problem with an old version of FFmpeg; where should I report it?
Nowhere. We do not support old FFmpeg versions in any way, we simply lack
the time, motivation and manpower to do so. If you have a problem with an
-old version of FFmpeg, upgrade to the latest Subversion snapshot. If you
+old version of FFmpeg, upgrade to the latest git snapshot. If you
still experience the problem, then you can report it according to the
guidelines in @url{http://ffmpeg.org/bugreports.html}.
@@ -47,7 +47,7 @@ Likely reasons
@item We are busy and haven't had time yet to read your report or
investigate the issue.
@item You didn't follow @url{http://ffmpeg.org/bugreports.html}.
-@item You didn't use Subversion HEAD.
+@item You didn't use git HEAD.
@item You reported a segmentation fault without gdb output.
@item You describe a problem but not how to reproduce it.
@item It's unclear if you use ffmpeg as command line tool or use
diff --git a/doc/general.texi b/doc/general.texi
index 080357a39d..92bcc0d50d 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -1032,7 +1032,7 @@ llrint() in its C library.
Install your Cygwin with all the "Base" packages, plus the
following "Devel" ones:
@example
-binutils, gcc4-core, make, subversion, mingw-runtime, texi2html
+binutils, gcc4-core, make, git, mingw-runtime, texi2html
@end example
And the following "Utils" one:
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 92c822b772..02d7eae3f1 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -71,7 +71,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
...
*/
-//Changelog: use the Subversion log
+//Changelog: use git log
#include "config.h"
#include "libavutil/avutil.h"
diff --git a/tests/fate.sh b/tests/fate.sh
index 56729d88bc..6f0e0fffcb 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -29,7 +29,6 @@ checkout(){
case "$repo" in
file:*|/*) src="${repo#file:}" ;;
git:*) git clone "$repo" "$src" ;;
- svn:*) svn co "$repo" "$src" ;;
esac
}
@@ -37,7 +36,6 @@ update()(
cd ${src} || return
case "$repo" in
git:*) git pull ;;
- svn:*) svn up ;;
esac
)
diff --git a/version.sh b/version.sh
index be63945014..51bca4f21a 100755
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,5 @@
#!/bin/sh
-revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
-test "$revision" && revision=SVN-r$revision
-
# check for git short hash
if ! test "$revision"; then
revision=$(cd "$1" && git describe --tags --match N 2> /dev/null)