@@ -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

@@ -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:

@@ -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

@@ -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.

@@ -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

@@ -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:

@@ -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"

@@ -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

 )

@@ -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)