diff --git a/contrib/sdk/sources/ffmpeg/.config b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/.config similarity index 100% rename from contrib/sdk/sources/ffmpeg/.config rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/.config diff --git a/contrib/sdk/sources/ffmpeg/.version b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/.version similarity index 100% rename from contrib/sdk/sources/ffmpeg/.version rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/.version diff --git a/contrib/sdk/sources/ffmpeg/COPYING.GPLv2 b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.GPLv2 similarity index 100% rename from contrib/sdk/sources/ffmpeg/COPYING.GPLv2 rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.GPLv2 diff --git a/contrib/sdk/sources/ffmpeg/COPYING.GPLv3 b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.GPLv3 similarity index 100% rename from contrib/sdk/sources/ffmpeg/COPYING.GPLv3 rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.GPLv3 diff --git a/contrib/sdk/sources/ffmpeg/COPYING.LGPLv2.1 b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.LGPLv2.1 similarity index 100% rename from contrib/sdk/sources/ffmpeg/COPYING.LGPLv2.1 rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.LGPLv2.1 diff --git a/contrib/sdk/sources/ffmpeg/COPYING.LGPLv3 b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.LGPLv3 similarity index 100% rename from contrib/sdk/sources/ffmpeg/COPYING.LGPLv3 rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/COPYING.LGPLv3 diff --git a/contrib/sdk/sources/ffmpeg/CREDITS b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/CREDITS similarity index 100% rename from contrib/sdk/sources/ffmpeg/CREDITS rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/CREDITS diff --git a/contrib/sdk/sources/ffmpeg/Changelog b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/Changelog similarity index 100% rename from contrib/sdk/sources/ffmpeg/Changelog rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/Changelog diff --git a/contrib/sdk/sources/ffmpeg/INSTALL b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/INSTALL similarity index 100% rename from contrib/sdk/sources/ffmpeg/INSTALL rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/INSTALL diff --git a/contrib/sdk/sources/ffmpeg/LICENSE b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/LICENSE similarity index 100% rename from contrib/sdk/sources/ffmpeg/LICENSE rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/LICENSE diff --git a/contrib/sdk/sources/ffmpeg/MAINTAINERS b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/MAINTAINERS similarity index 100% rename from contrib/sdk/sources/ffmpeg/MAINTAINERS rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/MAINTAINERS diff --git a/contrib/sdk/sources/ffmpeg/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/Makefile diff --git a/contrib/sdk/sources/ffmpeg/README b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/README similarity index 100% rename from contrib/sdk/sources/ffmpeg/README rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/README diff --git a/contrib/sdk/sources/ffmpeg/RELEASE b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/RELEASE similarity index 100% rename from contrib/sdk/sources/ffmpeg/RELEASE rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/RELEASE diff --git a/contrib/sdk/sources/ffmpeg/VERSION b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/VERSION similarity index 100% rename from contrib/sdk/sources/ffmpeg/VERSION rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/VERSION diff --git a/contrib/sdk/sources/ffmpeg/arch.mak b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/arch.mak similarity index 100% rename from contrib/sdk/sources/ffmpeg/arch.mak rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/arch.mak diff --git a/contrib/sdk/sources/ffmpeg/cmdutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/cmdutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/cmdutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/cmdutils.c diff --git a/contrib/sdk/sources/ffmpeg/cmdutils.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/cmdutils.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/cmdutils.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/cmdutils.h diff --git a/contrib/sdk/sources/ffmpeg/cmdutils_common_opts.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/cmdutils_common_opts.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/cmdutils_common_opts.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/cmdutils_common_opts.h diff --git a/contrib/sdk/sources/ffmpeg/common.mak b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/common.mak similarity index 100% rename from contrib/sdk/sources/ffmpeg/common.mak rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/common.mak diff --git a/contrib/sdk/sources/ffmpeg/compat/aix/math.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/aix/math.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/aix/math.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/aix/math.h diff --git a/contrib/sdk/sources/ffmpeg/compat/avisynth/avisynth_c.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/avisynth_c.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/avisynth/avisynth_c.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/avisynth_c.h diff --git a/contrib/sdk/sources/ffmpeg/compat/avisynth/avisynth_c_25.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/avisynth_c_25.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/avisynth/avisynth_c_25.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/avisynth_c_25.h diff --git a/contrib/sdk/sources/ffmpeg/compat/avisynth/avxsynth_c.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/avxsynth_c.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/avisynth/avxsynth_c.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/avxsynth_c.h diff --git a/contrib/sdk/sources/ffmpeg/compat/avisynth/windowsPorts/basicDataTypeConversions.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/windowsPorts/basicDataTypeConversions.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/avisynth/windowsPorts/basicDataTypeConversions.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/windowsPorts/basicDataTypeConversions.h diff --git a/contrib/sdk/sources/ffmpeg/compat/avisynth/windowsPorts/windows2linux.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/windowsPorts/windows2linux.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/avisynth/windowsPorts/windows2linux.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/avisynth/windowsPorts/windows2linux.h diff --git a/contrib/sdk/sources/ffmpeg/compat/getopt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/getopt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/getopt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/getopt.c diff --git a/contrib/sdk/sources/ffmpeg/compat/msvcrt/snprintf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/msvcrt/snprintf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/msvcrt/snprintf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/msvcrt/snprintf.c diff --git a/contrib/sdk/sources/ffmpeg/compat/msvcrt/snprintf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/msvcrt/snprintf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/msvcrt/snprintf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/msvcrt/snprintf.h diff --git a/contrib/sdk/sources/ffmpeg/compat/os2threads.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/os2threads.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/os2threads.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/os2threads.h diff --git a/contrib/sdk/sources/ffmpeg/compat/plan9/head b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/plan9/head similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/plan9/head rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/plan9/head diff --git a/contrib/sdk/sources/ffmpeg/compat/plan9/main.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/plan9/main.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/plan9/main.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/plan9/main.c diff --git a/contrib/sdk/sources/ffmpeg/compat/plan9/printf b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/plan9/printf similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/plan9/printf rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/plan9/printf diff --git a/contrib/sdk/sources/ffmpeg/compat/strtod.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/strtod.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/strtod.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/strtod.c diff --git a/contrib/sdk/sources/ffmpeg/compat/tms470/math.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/tms470/math.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/tms470/math.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/tms470/math.h diff --git a/contrib/sdk/sources/ffmpeg/compat/va_copy.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/va_copy.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/va_copy.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/va_copy.h diff --git a/contrib/sdk/sources/ffmpeg/compat/w32pthreads.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/w32pthreads.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/compat/w32pthreads.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/compat/w32pthreads.h diff --git a/contrib/sdk/sources/ffmpeg/config.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/config.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.asm diff --git a/contrib/sdk/sources/ffmpeg/config.fate b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.fate similarity index 100% rename from contrib/sdk/sources/ffmpeg/config.fate rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.fate diff --git a/contrib/sdk/sources/ffmpeg/config.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/config.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.h diff --git a/contrib/sdk/sources/ffmpeg/config.mak b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.mak similarity index 94% rename from contrib/sdk/sources/ffmpeg/config.mak rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.mak index 2a513d82b..55482f6b2 100644 --- a/contrib/sdk/sources/ffmpeg/config.mak +++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.mak @@ -34,9 +34,9 @@ STRIP=kos32-strip CP=cp -p LN_S=ln -s -f CPPFLAGS= -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=32 -D_LARGEFILE_SOURCE -U__STRICT_ANSI__ -CFLAGS= -I../newlib/libc/include -I../zlib -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -fno-ident -fomit-frame-pointer -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O2 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla +CFLAGS= -I../../newlib/libc/include -I../../zlib -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -fno-ident -fomit-frame-pointer -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O2 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla CXXFLAGS= -D__STDC_CONSTANT_MACROS -ASFLAGS= -I../newlib/libc/include -U_Win32 -U_WIN32 -U__MINGW32__ +ASFLAGS= -I../../newlib/libc/include -U_Win32 -U_WIN32 -U__MINGW32__ AS_C=-c AS_O=-o $@ CC_C=-c @@ -48,9 +48,9 @@ LD_O=-o $@ LD_LIB=-l% LD_PATH=-L DLLTOOL=dlltool -LDFLAGS=-L../../lib -L/home/autobuild/tools/win32/mingw32/lib --output-def $$(@:$(SLIBSUF)=.orig.def) -nostdlib --enable-runtime-pseudo-reloc +LDFLAGS=-L../../../lib -L/home/autobuild/tools/win32/mingw32/lib --output-def $$(@:$(SLIBSUF)=.orig.def) -nostdlib --enable-runtime-pseudo-reloc LDFLAGS-ffserver=-Wl,-E -SHFLAGS=-shared -s -T../newlib/dll.lds -Bsymbolic --entry _DllStartup --image-base 0 --out-implib $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) --version-script $(SUBDIR)lib$(NAME).ver -ldll +SHFLAGS=-shared -s -T../../newlib/dll.lds -Bsymbolic --entry _DllStartup --image-base 0 --out-implib $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) --version-script $(SUBDIR)lib$(NAME).ver -ldll YASMFLAGS=-f win32 -DPREFIX BUILDSUF= PROGSSUF= diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.mak.bak b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.mak.bak new file mode 100644 index 000000000..2be1f1d39 --- /dev/null +++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/config.mak.bak @@ -0,0 +1,1748 @@ +# Automatically generated by configure - do not modify! +ifndef FFMPEG_CONFIG_MAK +FFMPEG_CONFIG_MAK=1 +FFMPEG_CONFIGURATION=--disable-static --enable-shared --disable-network --disable-debug --enable-memalign-hack --enable-gpl --disable-avx --disable-fma4 --disable-programs --extra-cflags=-I../newlib/include --disable-pthreads --disable-w32threads --extra-cflags=-U_Win32 --extra-cflags=-U_WIN32 --extra-cflags=-U__MINGW32__ --enable-runtime-cpudetect --disable-encoders --disable-muxers --disable-protocols --enable-protocol=file --disable-devices --disable-postproc --disable-avfilter --disable-hwaccels +prefix=/usr/local +LIBDIR=$(DESTDIR)${prefix}/lib +SHLIBDIR=$(DESTDIR)${prefix}/bin +INCDIR=$(DESTDIR)${prefix}/include +BINDIR=$(DESTDIR)${prefix}/bin +DATADIR=$(DESTDIR)${prefix}/share/ffmpeg +DOCDIR=$(DESTDIR)${prefix}/share/doc/ffmpeg +MANDIR=$(DESTDIR)${prefix}/share/man +SRC_PATH=. +ifndef MAIN_MAKEFILE +SRC_PATH:=$(SRC_PATH:.%=..%) +endif +CC_IDENT=gcc 4.8.1 (GCC) +ARCH=x86 +CC = kos32-gcc +CXX= kos32-g++ +AS = kos32-gcc +LD = kos32-ld +DEPCC=gcc +DEPCCFLAGS= $(CPPFLAGS) +DEPAS=gcc +DEPASFLAGS= $(CPPFLAGS) +YASM=nasm +DEPYASM=nasm +AR=kos32-ar +ARFLAGS=rc +AR_O=$@ +RANLIB=: +STRIP=kos32-strip +CP=cp -p +LN_S=ln -s -f +CPPFLAGS= -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=32 -D_LARGEFILE_SOURCE -U__STRICT_ANSI__ +CFLAGS= -I../../newlib/libc/include -I../../zlib -U_Win32 -U_WIN32 -U__MINGW32__ -std=c99 -fno-ident -fomit-frame-pointer -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O2 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla +CXXFLAGS= -D__STDC_CONSTANT_MACROS +ASFLAGS= -I../../newlib/libc/include -U_Win32 -U_WIN32 -U__MINGW32__ +AS_C=-c +AS_O=-o $@ +CC_C=-c +CC_E=-E -o $@ +CC_O=-o $@ +CXX_C=-c +CXX_O=-o $@ +LD_O=-o $@ +LD_LIB=-l% +LD_PATH=-L +DLLTOOL=dlltool +LDFLAGS=-L../../lib -L/home/autobuild/tools/win32/mingw32/lib --output-def $$(@:$(SLIBSUF)=.orig.def) -nostdlib --enable-runtime-pseudo-reloc +LDFLAGS-ffserver=-Wl,-E +SHFLAGS=-shared -s -T../newlib/dll.lds -Bsymbolic --entry _DllStartup --image-base 0 --out-implib $(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) --version-script $(SUBDIR)lib$(NAME).ver -ldll +YASMFLAGS=-f win32 -DPREFIX +BUILDSUF= +PROGSSUF= +FULLNAME=$(NAME)$(BUILDSUF) +LIBPREF=lib +LIBSUF=.a +LIBNAME=$(LIBPREF)$(FULLNAME)$(LIBSUF) +SLIBPREF= +SLIBSUF=.dll +EXESUF=.exe +EXTRA_VERSION= +CCDEP= +CXXDEP= +CCDEP_FLAGS= +ASDEP= +ASDEP_FLAGS= +CC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ +AS_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ +HOSTCC=gcc +HOSTLD=gcc +HOSTCFLAGS=-O2 -std=c99 -Wall +HOSTCPPFLAGS=-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600 +HOSTEXESUF=.exe +HOSTLDFLAGS= +HOSTLIBS=-lm +DEPHOSTCC=gcc +DEPHOSTCCFLAGS= $(HOSTCCFLAGS) +HOSTCCDEP= +HOSTCCDEP_FLAGS= +HOSTCC_DEPFLAGS=-MMD -MF $(@:.o=.d) -MT $@ +HOSTCC_C=-c +HOSTCC_O=-o $@ +HOSTLD_O=-o $@ +TARGET_EXEC= +TARGET_PATH=$(CURDIR) +TARGET_SAMPLES=$(SAMPLES) +LIBS-ffplay= +CFLAGS-ffplay= +ZLIB=-lz +LIB_INSTALL_EXTRA_CMD=$$(RANLIB) "$(LIBDIR)/$(LIBNAME)" +EXTRALIBS=-ldll -lz.dll -lc.dll -lgcc +COMPAT_OBJS= +EXEOBJS= +INSTALL=install +LIBTARGET=i386 +SLIBNAME=$(SLIBPREF)$(FULLNAME)$(SLIBSUF) +SLIBNAME_WITH_VERSION=$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF) +SLIBNAME_WITH_MAJOR=$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF) +SLIB_CREATE_DEF_CMD= +SLIB_EXTRA_CMD=-sed -e "s/ @[^ ]*//" $$(@:$(SLIBSUF)=.orig.def) > $$(@:$(SLIBSUF)=.def); $(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR) +SLIB_INSTALL_NAME=$(SLIBNAME_WITH_MAJOR) +SLIB_INSTALL_LINKS= +SLIB_INSTALL_EXTRA_LIB=lib$(SLIBNAME:$(SLIBSUF)=.dll.a) $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.def) +SLIB_INSTALL_EXTRA_SHLIB=$(SLIBNAME:$(SLIBSUF)=.lib) +SAMPLES:=$(FATE_SAMPLES) +NOREDZONE_FLAGS=-mno-red-zone +libavcodec_VERSION=55.39.101 +libavcodec_VERSION_MAJOR=55 +libavcodec_VERSION_MINOR=39 +libavdevice_VERSION=55.5.100 +libavdevice_VERSION_MAJOR=55 +libavdevice_VERSION_MINOR=5 +libavfilter_VERSION=3.90.100 +libavfilter_VERSION_MAJOR=3 +libavfilter_VERSION_MINOR=90 +libavformat_VERSION=55.19.104 +libavformat_VERSION_MAJOR=55 +libavformat_VERSION_MINOR=19 +libavresample_VERSION=1.1.0 +libavresample_VERSION_MAJOR=1 +libavresample_VERSION_MINOR=1 +libavutil_VERSION=52.48.101 +libavutil_VERSION_MAJOR=52 +libavutil_VERSION_MINOR=48 +libpostproc_VERSION=52.3.100 +libpostproc_VERSION_MAJOR=52 +libpostproc_VERSION_MINOR=3 +libswresample_VERSION=0.17.104 +libswresample_VERSION_MAJOR=0 +libswresample_VERSION_MINOR=17 +libswscale_VERSION=2.5.101 +libswscale_VERSION_MAJOR=2 +libswscale_VERSION_MINOR=5 +!ARCH_AARCH64=yes +!ARCH_ALPHA=yes +!ARCH_ARM=yes +!ARCH_AVR32=yes +!ARCH_AVR32_AP=yes +!ARCH_AVR32_UC=yes +!ARCH_BFIN=yes +!ARCH_IA64=yes +!ARCH_M68K=yes +!ARCH_MIPS=yes +!ARCH_MIPS64=yes +!ARCH_PARISC=yes +!ARCH_PPC=yes +!ARCH_PPC64=yes +!ARCH_S390=yes +!ARCH_SH4=yes +!ARCH_SPARC=yes +!ARCH_SPARC64=yes +!ARCH_TILEGX=yes +!ARCH_TILEPRO=yes +!ARCH_TOMI=yes +ARCH_X86=yes +ARCH_X86_32=yes +!ARCH_X86_64=yes +!HAVE_ARMV5TE=yes +!HAVE_ARMV6=yes +!HAVE_ARMV6T2=yes +!HAVE_NEON=yes +!HAVE_VFP=yes +!HAVE_VFPV3=yes +HAVE_AMD3DNOW=yes +HAVE_AMD3DNOWEXT=yes +!HAVE_AVX=yes +!HAVE_AVX2=yes +!HAVE_FMA4=yes +HAVE_I686=yes +HAVE_MMX=yes +HAVE_MMXEXT=yes +HAVE_SSE=yes +HAVE_SSE2=yes +HAVE_SSE3=yes +HAVE_SSE4=yes +HAVE_SSE42=yes +HAVE_SSSE3=yes +!HAVE_ALTIVEC=yes +!HAVE_PPC4XX=yes +!HAVE_VIS=yes +!HAVE_MIPSFPU=yes +!HAVE_MIPS32R2=yes +!HAVE_MIPSDSPR1=yes +!HAVE_MIPSDSPR2=yes +!HAVE_ARMV5TE_EXTERNAL=yes +!HAVE_ARMV6_EXTERNAL=yes +!HAVE_ARMV6T2_EXTERNAL=yes +!HAVE_NEON_EXTERNAL=yes +!HAVE_VFP_EXTERNAL=yes +!HAVE_VFPV3_EXTERNAL=yes +HAVE_AMD3DNOW_EXTERNAL=yes +HAVE_AMD3DNOWEXT_EXTERNAL=yes +!HAVE_AVX_EXTERNAL=yes +!HAVE_AVX2_EXTERNAL=yes +!HAVE_FMA4_EXTERNAL=yes +!HAVE_I686_EXTERNAL=yes +HAVE_MMX_EXTERNAL=yes +HAVE_MMXEXT_EXTERNAL=yes +HAVE_SSE_EXTERNAL=yes +HAVE_SSE2_EXTERNAL=yes +HAVE_SSE3_EXTERNAL=yes +HAVE_SSE4_EXTERNAL=yes +HAVE_SSE42_EXTERNAL=yes +HAVE_SSSE3_EXTERNAL=yes +!HAVE_ALTIVEC_EXTERNAL=yes +!HAVE_PPC4XX_EXTERNAL=yes +!HAVE_VIS_EXTERNAL=yes +!HAVE_MIPSFPU_EXTERNAL=yes +!HAVE_MIPS32R2_EXTERNAL=yes +!HAVE_MIPSDSPR1_EXTERNAL=yes +!HAVE_MIPSDSPR2_EXTERNAL=yes +!HAVE_ARMV5TE_INLINE=yes +!HAVE_ARMV6_INLINE=yes +!HAVE_ARMV6T2_INLINE=yes +!HAVE_NEON_INLINE=yes +!HAVE_VFP_INLINE=yes +!HAVE_VFPV3_INLINE=yes +HAVE_AMD3DNOW_INLINE=yes +HAVE_AMD3DNOWEXT_INLINE=yes +!HAVE_AVX_INLINE=yes +!HAVE_AVX2_INLINE=yes +!HAVE_FMA4_INLINE=yes +!HAVE_I686_INLINE=yes +HAVE_MMX_INLINE=yes +HAVE_MMXEXT_INLINE=yes +HAVE_SSE_INLINE=yes +HAVE_SSE2_INLINE=yes +HAVE_SSE3_INLINE=yes +HAVE_SSE4_INLINE=yes +HAVE_SSE42_INLINE=yes +HAVE_SSSE3_INLINE=yes +!HAVE_ALTIVEC_INLINE=yes +!HAVE_PPC4XX_INLINE=yes +!HAVE_VIS_INLINE=yes +!HAVE_MIPSFPU_INLINE=yes +!HAVE_MIPS32R2_INLINE=yes +!HAVE_MIPSDSPR1_INLINE=yes +!HAVE_MIPSDSPR2_INLINE=yes +HAVE_INLINE_ASM=yes +HAVE_SYMVER=yes +HAVE_YASM=yes +!HAVE_BIGENDIAN=yes +HAVE_FAST_UNALIGNED=yes +!HAVE_INCOMPATIBLE_LIBAV_ABI=yes +!HAVE_INCOMPATIBLE_FORK_ABI=yes +!HAVE_PTHREADS=yes +!HAVE_W32THREADS=yes +!HAVE_OS2THREADS=yes +HAVE_ATOMICS_GCC=yes +!HAVE_ATOMICS_SUNCC=yes +!HAVE_ATOMICS_WIN32=yes +HAVE_ATANF=yes +HAVE_ATAN2F=yes +HAVE_CBRT=yes +HAVE_CBRTF=yes +HAVE_COSF=yes +HAVE_EXP2=yes +HAVE_EXP2F=yes +HAVE_EXPF=yes +HAVE_ISINF=yes +HAVE_ISNAN=yes +HAVE_LDEXPF=yes +HAVE_LLRINT=yes +HAVE_LLRINTF=yes +HAVE_LOG2=yes +HAVE_LOG2F=yes +HAVE_LOG10F=yes +HAVE_LRINT=yes +HAVE_LRINTF=yes +HAVE_POWF=yes +HAVE_RINT=yes +HAVE_ROUND=yes +HAVE_ROUNDF=yes +HAVE_SINF=yes +HAVE_TRUNC=yes +HAVE_TRUNCF=yes +HAVE_ACCESS=yes +!HAVE_ALIGNED_MALLOC=yes +HAVE_ALIGNED_STACK=yes +!HAVE_ALSA_ASOUNDLIB_H=yes +!HAVE_ALTIVEC_H=yes +!HAVE_ARPA_INET_H=yes +!HAVE_ASM_MOD_Q=yes +!HAVE_ASM_MOD_Y=yes +!HAVE_ASM_TYPES_H=yes +!HAVE_ATOMIC_CAS_PTR=yes +HAVE_ATOMICS_NATIVE=yes +HAVE_ATTRIBUTE_MAY_ALIAS=yes +HAVE_ATTRIBUTE_PACKED=yes +!HAVE_CDIO_PARANOIA_H=yes +!HAVE_CDIO_PARANOIA_PARANOIA_H=yes +!HAVE_CL_CL_H=yes +!HAVE_CLOCK_GETTIME=yes +!HAVE_CLOSESOCKET=yes +HAVE_COMMANDLINETOARGVW=yes +!HAVE_CPUNOP=yes +HAVE_CRYPTGENRANDOM=yes +!HAVE_DCBZL=yes +!HAVE_DEV_BKTR_IOCTL_BT848_H=yes +!HAVE_DEV_BKTR_IOCTL_METEOR_H=yes +!HAVE_DEV_IC_BT8XX_H=yes +!HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H=yes +!HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H=yes +HAVE_DIRECT_H=yes +!HAVE_DLFCN_H=yes +!HAVE_DLOPEN=yes +HAVE_DOS_PATHS=yes +!HAVE_DXVA_H=yes +HAVE_EBP_AVAILABLE=yes +HAVE_EBX_AVAILABLE=yes +!HAVE_FAST_64BIT=yes +HAVE_FAST_CLZ=yes +!HAVE_FAST_CMOV=yes +!HAVE_FCNTL=yes +!HAVE_FORK=yes +!HAVE_GETADDRINFO=yes +!HAVE_GETHRTIME=yes +!HAVE_GETRUSAGE=yes +!HAVE_GLOB=yes +HAVE_GNU_AS=yes +!HAVE_IBM_ASM=yes +!HAVE_INET_ATON=yes +HAVE_IO_H=yes +HAVE_INLINE_ASM_LABELS=yes +HAVE_ISATTY=yes +!HAVE_JACK_PORT_GET_LATENCY_RANGE=yes +HAVE_KBHIT=yes +!HAVE_LDBRX=yes +!HAVE_LIBDC1394_1=yes +!HAVE_LIBDC1394_2=yes +HAVE_LOCAL_ALIGNED_16=yes +HAVE_LOCAL_ALIGNED_8=yes +!HAVE_LOCALTIME_R=yes +!HAVE_LOONGSON=yes +!HAVE_LZO1X_999_COMPRESS=yes +!HAVE_MACHINE_IOCTL_BT848_H=yes +!HAVE_MACHINE_IOCTL_METEOR_H=yes +!HAVE_MACHINE_RW_BARRIER=yes +HAVE_MAKEINFO=yes +HAVE_MALLOC_H=yes +!HAVE_MEMALIGN=yes +!HAVE_MKSTEMP=yes +!HAVE_MM_EMPTY=yes +!HAVE_MMAP=yes +!HAVE_MSVCRT=yes +!HAVE_NANOSLEEP=yes +!HAVE_OPENJPEG_1_5_OPENJPEG_H=yes +HAVE_PEEKNAMEDPIPE=yes +HAVE_PERL=yes +HAVE_POD2MAN=yes +!HAVE_POLL_H=yes +!HAVE_POSIX_MEMALIGN=yes +HAVE_PRAGMA_DEPRECATED=yes +!HAVE_PTHREAD_CANCEL=yes +!HAVE_RDTSC=yes +HAVE_RSYNC_CONTIMEOUT=yes +!HAVE_SARESTART=yes +!HAVE_SCHED_GETAFFINITY=yes +!HAVE_SDL=yes +HAVE_SETCONSOLETEXTATTRIBUTE=yes +!HAVE_SETMODE=yes +!HAVE_SETRLIMIT=yes +HAVE_SLEEP=yes +!HAVE_SNDIO_H=yes +!HAVE_SOCKLEN_T=yes +!HAVE_SOUNDCARD_H=yes +!HAVE_STRERROR_R=yes +!HAVE_STRUCT_ADDRINFO=yes +!HAVE_STRUCT_GROUP_SOURCE_REQ=yes +!HAVE_STRUCT_IP_MREQ_SOURCE=yes +!HAVE_STRUCT_IPV6_MREQ=yes +!HAVE_STRUCT_POLLFD=yes +!HAVE_STRUCT_RUSAGE_RU_MAXRSS=yes +!HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE=yes +!HAVE_STRUCT_SOCKADDR_IN6=yes +!HAVE_STRUCT_SOCKADDR_SA_LEN=yes +!HAVE_STRUCT_SOCKADDR_STORAGE=yes +!HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=yes +!HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE=yes +HAVE_SYMVER_ASM_LABEL=yes +!HAVE_SYMVER_GNU_ASM=yes +HAVE_SYNC_VAL_COMPARE_AND_SWAP=yes +!HAVE_SYSCONF=yes +!HAVE_SYSCTL=yes +!HAVE_SYS_MMAN_H=yes +HAVE_SYS_PARAM_H=yes +HAVE_SYS_RESOURCE_H=yes +!HAVE_SYS_SELECT_H=yes +!HAVE_SYS_SOUNDCARD_H=yes +HAVE_SYS_TIME_H=yes +!HAVE_SYS_UN_H=yes +!HAVE_SYS_VIDEOIO_H=yes +!HAVE_TERMIOS_H=yes +!HAVE_TEXI2HTML=yes +!HAVE_THREADS=yes +HAVE_UNISTD_H=yes +HAVE_USLEEP=yes +!HAVE_VFP_ARGS=yes +!HAVE_WINSOCK2_H=yes +!HAVE_XFORM_ASM=yes +!HAVE_XMM_CLOBBERS=yes +CONFIG_BSFS=yes +CONFIG_DECODERS=yes +CONFIG_DEMUXERS=yes +!CONFIG_ENCODERS=yes +CONFIG_FILTERS=yes +!CONFIG_HWACCELS=yes +!CONFIG_INDEVS=yes +!CONFIG_MUXERS=yes +!CONFIG_OUTDEVS=yes +CONFIG_PARSERS=yes +CONFIG_PROTOCOLS=yes +CONFIG_DOC=yes +!CONFIG_HTMLPAGES=yes +CONFIG_MANPAGES=yes +CONFIG_PODPAGES=yes +CONFIG_TXTPAGES=yes +!CONFIG_AVISYNTH=yes +!CONFIG_BZLIB=yes +!CONFIG_CRYSTALHD=yes +!CONFIG_FONTCONFIG=yes +!CONFIG_FREI0R=yes +!CONFIG_GNUTLS=yes +!CONFIG_ICONV=yes +!CONFIG_LADSPA=yes +!CONFIG_LIBAACPLUS=yes +!CONFIG_LIBASS=yes +!CONFIG_LIBBLURAY=yes +!CONFIG_LIBCACA=yes +!CONFIG_LIBCDIO=yes +!CONFIG_LIBCELT=yes +!CONFIG_LIBDC1394=yes +!CONFIG_LIBFAAC=yes +!CONFIG_LIBFDK_AAC=yes +!CONFIG_LIBFLITE=yes +!CONFIG_LIBFREETYPE=yes +!CONFIG_LIBGME=yes +!CONFIG_LIBGSM=yes +!CONFIG_LIBIEC61883=yes +!CONFIG_LIBILBC=yes +!CONFIG_LIBMODPLUG=yes +!CONFIG_LIBMP3LAME=yes +!CONFIG_LIBNUT=yes +!CONFIG_LIBOPENCORE_AMRNB=yes +!CONFIG_LIBOPENCORE_AMRWB=yes +!CONFIG_LIBOPENCV=yes +!CONFIG_LIBOPENJPEG=yes +!CONFIG_LIBOPUS=yes +!CONFIG_LIBPULSE=yes +!CONFIG_LIBQUVI=yes +!CONFIG_LIBRTMP=yes +!CONFIG_LIBSCHROEDINGER=yes +!CONFIG_LIBSHINE=yes +!CONFIG_LIBSOXR=yes +!CONFIG_LIBSPEEX=yes +!CONFIG_LIBSSH=yes +!CONFIG_LIBSTAGEFRIGHT_H264=yes +!CONFIG_LIBTHEORA=yes +!CONFIG_LIBTWOLAME=yes +!CONFIG_LIBUTVIDEO=yes +!CONFIG_LIBV4L2=yes +!CONFIG_LIBVIDSTAB=yes +!CONFIG_LIBVO_AACENC=yes +!CONFIG_LIBVO_AMRWBENC=yes +!CONFIG_LIBVORBIS=yes +!CONFIG_LIBVPX=yes +!CONFIG_LIBWAVPACK=yes +!CONFIG_LIBX264=yes +!CONFIG_LIBXAVS=yes +!CONFIG_LIBXVID=yes +!CONFIG_LIBZMQ=yes +!CONFIG_LIBZVBI=yes +!CONFIG_OPENAL=yes +!CONFIG_OPENCL=yes +!CONFIG_OPENSSL=yes +!CONFIG_X11GRAB=yes +CONFIG_ZLIB=yes +!CONFIG_DXVA2=yes +!CONFIG_VAAPI=yes +!CONFIG_VDA=yes +!CONFIG_VDPAU=yes +CONFIG_AVCODEC=yes +CONFIG_AVDEVICE=yes +!CONFIG_AVFILTER=yes +CONFIG_AVFORMAT=yes +!CONFIG_AVRESAMPLE=yes +CONFIG_AVUTIL=yes +!CONFIG_POSTPROC=yes +CONFIG_SWRESAMPLE=yes +CONFIG_SWSCALE=yes +!CONFIG_FFPLAY=yes +!CONFIG_FFPROBE=yes +!CONFIG_FFSERVER=yes +!CONFIG_FFMPEG=yes +CONFIG_DCT=yes +CONFIG_DWT=yes +CONFIG_ERROR_RESILIENCE=yes +CONFIG_FAST_UNALIGNED=yes +CONFIG_FFT=yes +!CONFIG_FTRAPV=yes +CONFIG_GPL=yes +!CONFIG_GRAY=yes +!CONFIG_HARDCODED_TABLES=yes +!CONFIG_INCOMPATIBLE_LIBAV_ABI=yes +!CONFIG_INCOMPATIBLE_FORK_ABI=yes +CONFIG_LSP=yes +CONFIG_LZO=yes +CONFIG_MDCT=yes +CONFIG_MEMALIGN_HACK=yes +!CONFIG_MEMORY_POISONING=yes +!CONFIG_NETWORK=yes +!CONFIG_NONFREE=yes +!CONFIG_PIC=yes +CONFIG_RDFT=yes +CONFIG_RUNTIME_CPUDETECT=yes +CONFIG_SAFE_BITSTREAM_READER=yes +CONFIG_SHARED=yes +!CONFIG_SMALL=yes +!CONFIG_SRAM=yes +!CONFIG_STATIC=yes +CONFIG_SWSCALE_ALPHA=yes +!CONFIG_THUMB=yes +!CONFIG_VERSION3=yes +!CONFIG_XMM_CLOBBER_TEST=yes +CONFIG_AANDCTTABLES=yes +CONFIG_AC3DSP=yes +!CONFIG_AUDIO_FRAME_QUEUE=yes +CONFIG_DSPUTIL=yes +CONFIG_EXIF=yes +!CONFIG_FRAME_THREAD_ENCODER=yes +!CONFIG_GCRYPT=yes +CONFIG_GOLOMB=yes +!CONFIG_GPLV3=yes +CONFIG_H264CHROMA=yes +CONFIG_H264DSP=yes +CONFIG_H264PRED=yes +CONFIG_H264QPEL=yes +CONFIG_HPELDSP=yes +CONFIG_HUFFMAN=yes +!CONFIG_LGPLV3=yes +!CONFIG_LPC=yes +CONFIG_MPEGAUDIO=yes +CONFIG_MPEGAUDIODSP=yes +CONFIG_MPEGVIDEO=yes +!CONFIG_MPEGVIDEOENC=yes +!CONFIG_NETTLE=yes +CONFIG_RANGECODER=yes +CONFIG_RIFFDEC=yes +!CONFIG_RIFFENC=yes +!CONFIG_RTPDEC=yes +!CONFIG_RTPENC_CHAIN=yes +CONFIG_SINEWIN=yes +CONFIG_VIDEODSP=yes +CONFIG_VP3DSP=yes +CONFIG_AAC_ADTSTOASC_BSF=yes +CONFIG_CHOMP_BSF=yes +CONFIG_DUMP_EXTRADATA_BSF=yes +CONFIG_H264_MP4TOANNEXB_BSF=yes +CONFIG_IMX_DUMP_HEADER_BSF=yes +CONFIG_MJPEG2JPEG_BSF=yes +CONFIG_MJPEGA_DUMP_HEADER_BSF=yes +CONFIG_MP3_HEADER_COMPRESS_BSF=yes +CONFIG_MP3_HEADER_DECOMPRESS_BSF=yes +CONFIG_MOV2TEXTSUB_BSF=yes +CONFIG_NOISE_BSF=yes +CONFIG_REMOVE_EXTRADATA_BSF=yes +CONFIG_TEXT2MOVSUB_BSF=yes +CONFIG_AASC_DECODER=yes +CONFIG_AIC_DECODER=yes +CONFIG_AMV_DECODER=yes +CONFIG_ANM_DECODER=yes +CONFIG_ANSI_DECODER=yes +CONFIG_ASV1_DECODER=yes +CONFIG_ASV2_DECODER=yes +CONFIG_AURA_DECODER=yes +CONFIG_AURA2_DECODER=yes +CONFIG_AVRP_DECODER=yes +CONFIG_AVRN_DECODER=yes +CONFIG_AVS_DECODER=yes +CONFIG_AVUI_DECODER=yes +CONFIG_AYUV_DECODER=yes +CONFIG_BETHSOFTVID_DECODER=yes +CONFIG_BFI_DECODER=yes +CONFIG_BINK_DECODER=yes +CONFIG_BMP_DECODER=yes +CONFIG_BMV_VIDEO_DECODER=yes +CONFIG_BRENDER_PIX_DECODER=yes +CONFIG_C93_DECODER=yes +CONFIG_CAVS_DECODER=yes +CONFIG_CDGRAPHICS_DECODER=yes +CONFIG_CDXL_DECODER=yes +CONFIG_CINEPAK_DECODER=yes +CONFIG_CLJR_DECODER=yes +CONFIG_CLLC_DECODER=yes +CONFIG_COMFORTNOISE_DECODER=yes +CONFIG_CPIA_DECODER=yes +CONFIG_CSCD_DECODER=yes +CONFIG_CYUV_DECODER=yes +CONFIG_DFA_DECODER=yes +CONFIG_DIRAC_DECODER=yes +CONFIG_DNXHD_DECODER=yes +CONFIG_DPX_DECODER=yes +CONFIG_DSICINVIDEO_DECODER=yes +CONFIG_DVVIDEO_DECODER=yes +CONFIG_DXA_DECODER=yes +CONFIG_DXTORY_DECODER=yes +CONFIG_EACMV_DECODER=yes +CONFIG_EAMAD_DECODER=yes +CONFIG_EATGQ_DECODER=yes +CONFIG_EATGV_DECODER=yes +CONFIG_EATQI_DECODER=yes +CONFIG_EIGHTBPS_DECODER=yes +CONFIG_EIGHTSVX_EXP_DECODER=yes +CONFIG_EIGHTSVX_FIB_DECODER=yes +CONFIG_ESCAPE124_DECODER=yes +CONFIG_ESCAPE130_DECODER=yes +CONFIG_EXR_DECODER=yes +CONFIG_FFV1_DECODER=yes +CONFIG_FFVHUFF_DECODER=yes +CONFIG_FLASHSV_DECODER=yes +CONFIG_FLASHSV2_DECODER=yes +CONFIG_FLIC_DECODER=yes +CONFIG_FLV_DECODER=yes +CONFIG_FOURXM_DECODER=yes +CONFIG_FRAPS_DECODER=yes +CONFIG_FRWU_DECODER=yes +CONFIG_G2M_DECODER=yes +CONFIG_GIF_DECODER=yes +CONFIG_H261_DECODER=yes +CONFIG_H263_DECODER=yes +CONFIG_H263I_DECODER=yes +CONFIG_H263P_DECODER=yes +CONFIG_H264_DECODER=yes +!CONFIG_H264_CRYSTALHD_DECODER=yes +!CONFIG_H264_VDA_DECODER=yes +!CONFIG_H264_VDPAU_DECODER=yes +CONFIG_HEVC_DECODER=yes +CONFIG_HUFFYUV_DECODER=yes +CONFIG_IDCIN_DECODER=yes +CONFIG_IFF_BYTERUN1_DECODER=yes +CONFIG_IFF_ILBM_DECODER=yes +CONFIG_INDEO2_DECODER=yes +CONFIG_INDEO3_DECODER=yes +CONFIG_INDEO4_DECODER=yes +CONFIG_INDEO5_DECODER=yes +CONFIG_INTERPLAY_VIDEO_DECODER=yes +CONFIG_JPEG2000_DECODER=yes +CONFIG_JPEGLS_DECODER=yes +CONFIG_JV_DECODER=yes +CONFIG_KGV1_DECODER=yes +CONFIG_KMVC_DECODER=yes +CONFIG_LAGARITH_DECODER=yes +CONFIG_LOCO_DECODER=yes +CONFIG_MDEC_DECODER=yes +CONFIG_MIMIC_DECODER=yes +CONFIG_MJPEG_DECODER=yes +CONFIG_MJPEGB_DECODER=yes +CONFIG_MMVIDEO_DECODER=yes +CONFIG_MOTIONPIXELS_DECODER=yes +!CONFIG_MPEG_XVMC_DECODER=yes +CONFIG_MPEG1VIDEO_DECODER=yes +CONFIG_MPEG2VIDEO_DECODER=yes +CONFIG_MPEG4_DECODER=yes +!CONFIG_MPEG4_CRYSTALHD_DECODER=yes +!CONFIG_MPEG4_VDPAU_DECODER=yes +CONFIG_MPEGVIDEO_DECODER=yes +!CONFIG_MPEG_VDPAU_DECODER=yes +!CONFIG_MPEG1_VDPAU_DECODER=yes +!CONFIG_MPEG2_CRYSTALHD_DECODER=yes +CONFIG_MSA1_DECODER=yes +!CONFIG_MSMPEG4_CRYSTALHD_DECODER=yes +CONFIG_MSMPEG4V1_DECODER=yes +CONFIG_MSMPEG4V2_DECODER=yes +CONFIG_MSMPEG4V3_DECODER=yes +CONFIG_MSRLE_DECODER=yes +CONFIG_MSS1_DECODER=yes +CONFIG_MSS2_DECODER=yes +CONFIG_MSVIDEO1_DECODER=yes +CONFIG_MSZH_DECODER=yes +CONFIG_MTS2_DECODER=yes +CONFIG_MVC1_DECODER=yes +CONFIG_MVC2_DECODER=yes +CONFIG_MXPEG_DECODER=yes +CONFIG_NUV_DECODER=yes +CONFIG_PAF_VIDEO_DECODER=yes +CONFIG_PAM_DECODER=yes +CONFIG_PBM_DECODER=yes +CONFIG_PCX_DECODER=yes +CONFIG_PGM_DECODER=yes +CONFIG_PGMYUV_DECODER=yes +CONFIG_PICTOR_DECODER=yes +CONFIG_PNG_DECODER=yes +CONFIG_PPM_DECODER=yes +CONFIG_PRORES_DECODER=yes +CONFIG_PRORES_LGPL_DECODER=yes +CONFIG_PTX_DECODER=yes +CONFIG_QDRAW_DECODER=yes +CONFIG_QPEG_DECODER=yes +CONFIG_QTRLE_DECODER=yes +CONFIG_R10K_DECODER=yes +CONFIG_R210_DECODER=yes +CONFIG_RAWVIDEO_DECODER=yes +CONFIG_RL2_DECODER=yes +CONFIG_ROQ_DECODER=yes +CONFIG_RPZA_DECODER=yes +CONFIG_RV10_DECODER=yes +CONFIG_RV20_DECODER=yes +CONFIG_RV30_DECODER=yes +CONFIG_RV40_DECODER=yes +CONFIG_S302M_DECODER=yes +CONFIG_SANM_DECODER=yes +CONFIG_SGI_DECODER=yes +CONFIG_SGIRLE_DECODER=yes +CONFIG_SMACKER_DECODER=yes +CONFIG_SMC_DECODER=yes +CONFIG_SMVJPEG_DECODER=yes +CONFIG_SNOW_DECODER=yes +CONFIG_SP5X_DECODER=yes +CONFIG_SUNRAST_DECODER=yes +CONFIG_SVQ1_DECODER=yes +CONFIG_SVQ3_DECODER=yes +CONFIG_TARGA_DECODER=yes +CONFIG_TARGA_Y216_DECODER=yes +CONFIG_THEORA_DECODER=yes +CONFIG_THP_DECODER=yes +CONFIG_TIERTEXSEQVIDEO_DECODER=yes +CONFIG_TIFF_DECODER=yes +CONFIG_TMV_DECODER=yes +CONFIG_TRUEMOTION1_DECODER=yes +CONFIG_TRUEMOTION2_DECODER=yes +CONFIG_TSCC_DECODER=yes +CONFIG_TSCC2_DECODER=yes +CONFIG_TXD_DECODER=yes +CONFIG_ULTI_DECODER=yes +CONFIG_UTVIDEO_DECODER=yes +CONFIG_V210_DECODER=yes +CONFIG_V210X_DECODER=yes +CONFIG_V308_DECODER=yes +CONFIG_V408_DECODER=yes +CONFIG_V410_DECODER=yes +CONFIG_VB_DECODER=yes +CONFIG_VBLE_DECODER=yes +CONFIG_VC1_DECODER=yes +!CONFIG_VC1_CRYSTALHD_DECODER=yes +!CONFIG_VC1_VDPAU_DECODER=yes +CONFIG_VC1IMAGE_DECODER=yes +CONFIG_VCR1_DECODER=yes +CONFIG_VMDVIDEO_DECODER=yes +CONFIG_VMNC_DECODER=yes +CONFIG_VP3_DECODER=yes +CONFIG_VP5_DECODER=yes +CONFIG_VP6_DECODER=yes +CONFIG_VP6A_DECODER=yes +CONFIG_VP6F_DECODER=yes +CONFIG_VP8_DECODER=yes +CONFIG_VP9_DECODER=yes +CONFIG_VQA_DECODER=yes +CONFIG_WEBP_DECODER=yes +CONFIG_WMV1_DECODER=yes +CONFIG_WMV2_DECODER=yes +CONFIG_WMV3_DECODER=yes +!CONFIG_WMV3_CRYSTALHD_DECODER=yes +!CONFIG_WMV3_VDPAU_DECODER=yes +CONFIG_WMV3IMAGE_DECODER=yes +CONFIG_WNV1_DECODER=yes +CONFIG_XAN_WC3_DECODER=yes +CONFIG_XAN_WC4_DECODER=yes +CONFIG_XBM_DECODER=yes +CONFIG_XFACE_DECODER=yes +CONFIG_XL_DECODER=yes +CONFIG_XWD_DECODER=yes +CONFIG_Y41P_DECODER=yes +CONFIG_YOP_DECODER=yes +CONFIG_YUV4_DECODER=yes +CONFIG_ZERO12V_DECODER=yes +CONFIG_ZEROCODEC_DECODER=yes +CONFIG_ZLIB_DECODER=yes +CONFIG_ZMBV_DECODER=yes +CONFIG_AAC_DECODER=yes +CONFIG_AAC_LATM_DECODER=yes +CONFIG_AC3_DECODER=yes +CONFIG_ALAC_DECODER=yes +CONFIG_ALS_DECODER=yes +CONFIG_AMRNB_DECODER=yes +CONFIG_AMRWB_DECODER=yes +CONFIG_APE_DECODER=yes +CONFIG_ATRAC1_DECODER=yes +CONFIG_ATRAC3_DECODER=yes +CONFIG_BINKAUDIO_DCT_DECODER=yes +CONFIG_BINKAUDIO_RDFT_DECODER=yes +CONFIG_BMV_AUDIO_DECODER=yes +CONFIG_COOK_DECODER=yes +CONFIG_DCA_DECODER=yes +CONFIG_DSICINAUDIO_DECODER=yes +CONFIG_EAC3_DECODER=yes +CONFIG_EVRC_DECODER=yes +CONFIG_FFWAVESYNTH_DECODER=yes +CONFIG_FLAC_DECODER=yes +CONFIG_G723_1_DECODER=yes +CONFIG_G729_DECODER=yes +CONFIG_GSM_DECODER=yes +CONFIG_GSM_MS_DECODER=yes +CONFIG_IAC_DECODER=yes +CONFIG_IMC_DECODER=yes +CONFIG_MACE3_DECODER=yes +CONFIG_MACE6_DECODER=yes +CONFIG_METASOUND_DECODER=yes +CONFIG_MLP_DECODER=yes +CONFIG_MP1_DECODER=yes +CONFIG_MP1FLOAT_DECODER=yes +CONFIG_MP2_DECODER=yes +CONFIG_MP2FLOAT_DECODER=yes +CONFIG_MP3_DECODER=yes +CONFIG_MP3FLOAT_DECODER=yes +CONFIG_MP3ADU_DECODER=yes +CONFIG_MP3ADUFLOAT_DECODER=yes +CONFIG_MP3ON4_DECODER=yes +CONFIG_MP3ON4FLOAT_DECODER=yes +CONFIG_MPC7_DECODER=yes +CONFIG_MPC8_DECODER=yes +CONFIG_NELLYMOSER_DECODER=yes +CONFIG_PAF_AUDIO_DECODER=yes +CONFIG_QCELP_DECODER=yes +CONFIG_QDM2_DECODER=yes +CONFIG_RA_144_DECODER=yes +CONFIG_RA_288_DECODER=yes +CONFIG_RALF_DECODER=yes +CONFIG_SHORTEN_DECODER=yes +CONFIG_SIPR_DECODER=yes +CONFIG_SMACKAUD_DECODER=yes +CONFIG_SONIC_DECODER=yes +CONFIG_TAK_DECODER=yes +CONFIG_TRUEHD_DECODER=yes +CONFIG_TRUESPEECH_DECODER=yes +CONFIG_TTA_DECODER=yes +CONFIG_TWINVQ_DECODER=yes +CONFIG_VMDAUDIO_DECODER=yes +CONFIG_VORBIS_DECODER=yes +CONFIG_WAVPACK_DECODER=yes +CONFIG_WMALOSSLESS_DECODER=yes +CONFIG_WMAPRO_DECODER=yes +CONFIG_WMAV1_DECODER=yes +CONFIG_WMAV2_DECODER=yes +CONFIG_WMAVOICE_DECODER=yes +CONFIG_WS_SND1_DECODER=yes +CONFIG_PCM_ALAW_DECODER=yes +CONFIG_PCM_BLURAY_DECODER=yes +CONFIG_PCM_DVD_DECODER=yes +CONFIG_PCM_F32BE_DECODER=yes +CONFIG_PCM_F32LE_DECODER=yes +CONFIG_PCM_F64BE_DECODER=yes +CONFIG_PCM_F64LE_DECODER=yes +CONFIG_PCM_LXF_DECODER=yes +CONFIG_PCM_MULAW_DECODER=yes +CONFIG_PCM_S8_DECODER=yes +CONFIG_PCM_S8_PLANAR_DECODER=yes +CONFIG_PCM_S16BE_DECODER=yes +CONFIG_PCM_S16BE_PLANAR_DECODER=yes +CONFIG_PCM_S16LE_DECODER=yes +CONFIG_PCM_S16LE_PLANAR_DECODER=yes +CONFIG_PCM_S24BE_DECODER=yes +CONFIG_PCM_S24DAUD_DECODER=yes +CONFIG_PCM_S24LE_DECODER=yes +CONFIG_PCM_S24LE_PLANAR_DECODER=yes +CONFIG_PCM_S32BE_DECODER=yes +CONFIG_PCM_S32LE_DECODER=yes +CONFIG_PCM_S32LE_PLANAR_DECODER=yes +CONFIG_PCM_U8_DECODER=yes +CONFIG_PCM_U16BE_DECODER=yes +CONFIG_PCM_U16LE_DECODER=yes +CONFIG_PCM_U24BE_DECODER=yes +CONFIG_PCM_U24LE_DECODER=yes +CONFIG_PCM_U32BE_DECODER=yes +CONFIG_PCM_U32LE_DECODER=yes +CONFIG_PCM_ZORK_DECODER=yes +CONFIG_INTERPLAY_DPCM_DECODER=yes +CONFIG_ROQ_DPCM_DECODER=yes +CONFIG_SOL_DPCM_DECODER=yes +CONFIG_XAN_DPCM_DECODER=yes +CONFIG_ADPCM_4XM_DECODER=yes +CONFIG_ADPCM_ADX_DECODER=yes +CONFIG_ADPCM_AFC_DECODER=yes +CONFIG_ADPCM_CT_DECODER=yes +CONFIG_ADPCM_DTK_DECODER=yes +CONFIG_ADPCM_EA_DECODER=yes +CONFIG_ADPCM_EA_MAXIS_XA_DECODER=yes +CONFIG_ADPCM_EA_R1_DECODER=yes +CONFIG_ADPCM_EA_R2_DECODER=yes +CONFIG_ADPCM_EA_R3_DECODER=yes +CONFIG_ADPCM_EA_XAS_DECODER=yes +CONFIG_ADPCM_G722_DECODER=yes +CONFIG_ADPCM_G726_DECODER=yes +CONFIG_ADPCM_G726LE_DECODER=yes +CONFIG_ADPCM_IMA_AMV_DECODER=yes +CONFIG_ADPCM_IMA_APC_DECODER=yes +CONFIG_ADPCM_IMA_DK3_DECODER=yes +CONFIG_ADPCM_IMA_DK4_DECODER=yes +CONFIG_ADPCM_IMA_EA_EACS_DECODER=yes +CONFIG_ADPCM_IMA_EA_SEAD_DECODER=yes +CONFIG_ADPCM_IMA_ISS_DECODER=yes +CONFIG_ADPCM_IMA_OKI_DECODER=yes +CONFIG_ADPCM_IMA_QT_DECODER=yes +CONFIG_ADPCM_IMA_RAD_DECODER=yes +CONFIG_ADPCM_IMA_SMJPEG_DECODER=yes +CONFIG_ADPCM_IMA_WAV_DECODER=yes +CONFIG_ADPCM_IMA_WS_DECODER=yes +CONFIG_ADPCM_MS_DECODER=yes +CONFIG_ADPCM_SBPRO_2_DECODER=yes +CONFIG_ADPCM_SBPRO_3_DECODER=yes +CONFIG_ADPCM_SBPRO_4_DECODER=yes +CONFIG_ADPCM_SWF_DECODER=yes +CONFIG_ADPCM_THP_DECODER=yes +CONFIG_ADPCM_XA_DECODER=yes +CONFIG_ADPCM_YAMAHA_DECODER=yes +CONFIG_VIMA_DECODER=yes +CONFIG_SSA_DECODER=yes +CONFIG_ASS_DECODER=yes +CONFIG_DVBSUB_DECODER=yes +CONFIG_DVDSUB_DECODER=yes +CONFIG_JACOSUB_DECODER=yes +CONFIG_MICRODVD_DECODER=yes +CONFIG_MOVTEXT_DECODER=yes +CONFIG_MPL2_DECODER=yes +CONFIG_PGSSUB_DECODER=yes +CONFIG_PJS_DECODER=yes +CONFIG_REALTEXT_DECODER=yes +CONFIG_SAMI_DECODER=yes +CONFIG_SRT_DECODER=yes +CONFIG_SUBRIP_DECODER=yes +CONFIG_SUBVIEWER_DECODER=yes +CONFIG_SUBVIEWER1_DECODER=yes +CONFIG_TEXT_DECODER=yes +CONFIG_VPLAYER_DECODER=yes +CONFIG_WEBVTT_DECODER=yes +CONFIG_XSUB_DECODER=yes +!CONFIG_LIBCELT_DECODER=yes +!CONFIG_LIBFDK_AAC_DECODER=yes +!CONFIG_LIBGSM_DECODER=yes +!CONFIG_LIBGSM_MS_DECODER=yes +!CONFIG_LIBILBC_DECODER=yes +!CONFIG_LIBOPENCORE_AMRNB_DECODER=yes +!CONFIG_LIBOPENCORE_AMRWB_DECODER=yes +!CONFIG_LIBOPENJPEG_DECODER=yes +!CONFIG_LIBOPUS_DECODER=yes +!CONFIG_LIBSCHROEDINGER_DECODER=yes +!CONFIG_LIBSPEEX_DECODER=yes +!CONFIG_LIBSTAGEFRIGHT_H264_DECODER=yes +!CONFIG_LIBUTVIDEO_DECODER=yes +!CONFIG_LIBVORBIS_DECODER=yes +!CONFIG_LIBVPX_VP8_DECODER=yes +!CONFIG_LIBVPX_VP9_DECODER=yes +!CONFIG_LIBZVBI_TELETEXT_DECODER=yes +CONFIG_BINTEXT_DECODER=yes +CONFIG_XBIN_DECODER=yes +CONFIG_IDF_DECODER=yes +CONFIG_AAC_DEMUXER=yes +CONFIG_AC3_DEMUXER=yes +CONFIG_ACT_DEMUXER=yes +CONFIG_ADF_DEMUXER=yes +CONFIG_ADP_DEMUXER=yes +CONFIG_ADX_DEMUXER=yes +CONFIG_AEA_DEMUXER=yes +CONFIG_AFC_DEMUXER=yes +CONFIG_AIFF_DEMUXER=yes +CONFIG_AMR_DEMUXER=yes +CONFIG_ANM_DEMUXER=yes +CONFIG_APC_DEMUXER=yes +CONFIG_APE_DEMUXER=yes +CONFIG_AQTITLE_DEMUXER=yes +CONFIG_ASF_DEMUXER=yes +CONFIG_ASS_DEMUXER=yes +CONFIG_AST_DEMUXER=yes +CONFIG_AU_DEMUXER=yes +CONFIG_AVI_DEMUXER=yes +!CONFIG_AVISYNTH_DEMUXER=yes +CONFIG_AVR_DEMUXER=yes +CONFIG_AVS_DEMUXER=yes +CONFIG_BETHSOFTVID_DEMUXER=yes +CONFIG_BFI_DEMUXER=yes +CONFIG_BINTEXT_DEMUXER=yes +CONFIG_BINK_DEMUXER=yes +CONFIG_BIT_DEMUXER=yes +CONFIG_BMV_DEMUXER=yes +CONFIG_BRSTM_DEMUXER=yes +CONFIG_BOA_DEMUXER=yes +CONFIG_C93_DEMUXER=yes +CONFIG_CAF_DEMUXER=yes +CONFIG_CAVSVIDEO_DEMUXER=yes +CONFIG_CDG_DEMUXER=yes +CONFIG_CDXL_DEMUXER=yes +CONFIG_CONCAT_DEMUXER=yes +CONFIG_DATA_DEMUXER=yes +CONFIG_DAUD_DEMUXER=yes +CONFIG_DFA_DEMUXER=yes +CONFIG_DIRAC_DEMUXER=yes +CONFIG_DNXHD_DEMUXER=yes +CONFIG_DSICIN_DEMUXER=yes +CONFIG_DTS_DEMUXER=yes +CONFIG_DTSHD_DEMUXER=yes +CONFIG_DV_DEMUXER=yes +CONFIG_DXA_DEMUXER=yes +CONFIG_EA_DEMUXER=yes +CONFIG_EA_CDATA_DEMUXER=yes +CONFIG_EAC3_DEMUXER=yes +CONFIG_EPAF_DEMUXER=yes +CONFIG_FFM_DEMUXER=yes +CONFIG_FFMETADATA_DEMUXER=yes +CONFIG_FILMSTRIP_DEMUXER=yes +CONFIG_FLAC_DEMUXER=yes +CONFIG_FLIC_DEMUXER=yes +CONFIG_FLV_DEMUXER=yes +CONFIG_FOURXM_DEMUXER=yes +CONFIG_FRM_DEMUXER=yes +CONFIG_G722_DEMUXER=yes +CONFIG_G723_1_DEMUXER=yes +CONFIG_G729_DEMUXER=yes +CONFIG_GIF_DEMUXER=yes +CONFIG_GSM_DEMUXER=yes +CONFIG_GXF_DEMUXER=yes +CONFIG_H261_DEMUXER=yes +CONFIG_H263_DEMUXER=yes +CONFIG_H264_DEMUXER=yes +CONFIG_HEVC_DEMUXER=yes +CONFIG_HLS_DEMUXER=yes +CONFIG_ICO_DEMUXER=yes +CONFIG_IDCIN_DEMUXER=yes +CONFIG_IDF_DEMUXER=yes +CONFIG_IFF_DEMUXER=yes +CONFIG_ILBC_DEMUXER=yes +CONFIG_IMAGE2_DEMUXER=yes +CONFIG_IMAGE2PIPE_DEMUXER=yes +CONFIG_INGENIENT_DEMUXER=yes +CONFIG_IPMOVIE_DEMUXER=yes +CONFIG_IRCAM_DEMUXER=yes +CONFIG_ISS_DEMUXER=yes +CONFIG_IV8_DEMUXER=yes +CONFIG_IVF_DEMUXER=yes +CONFIG_JACOSUB_DEMUXER=yes +CONFIG_JV_DEMUXER=yes +CONFIG_LATM_DEMUXER=yes +CONFIG_LMLM4_DEMUXER=yes +CONFIG_LOAS_DEMUXER=yes +CONFIG_LVF_DEMUXER=yes +CONFIG_LXF_DEMUXER=yes +CONFIG_M4V_DEMUXER=yes +CONFIG_MATROSKA_DEMUXER=yes +CONFIG_MGSTS_DEMUXER=yes +CONFIG_MICRODVD_DEMUXER=yes +CONFIG_MJPEG_DEMUXER=yes +CONFIG_MLP_DEMUXER=yes +CONFIG_MM_DEMUXER=yes +CONFIG_MMF_DEMUXER=yes +CONFIG_MOV_DEMUXER=yes +CONFIG_MP3_DEMUXER=yes +CONFIG_MPC_DEMUXER=yes +CONFIG_MPC8_DEMUXER=yes +CONFIG_MPEGPS_DEMUXER=yes +CONFIG_MPEGTS_DEMUXER=yes +CONFIG_MPEGTSRAW_DEMUXER=yes +CONFIG_MPEGVIDEO_DEMUXER=yes +CONFIG_MPL2_DEMUXER=yes +CONFIG_MPSUB_DEMUXER=yes +CONFIG_MSNWC_TCP_DEMUXER=yes +CONFIG_MTV_DEMUXER=yes +CONFIG_MV_DEMUXER=yes +CONFIG_MVI_DEMUXER=yes +CONFIG_MXF_DEMUXER=yes +CONFIG_MXG_DEMUXER=yes +CONFIG_NC_DEMUXER=yes +CONFIG_NISTSPHERE_DEMUXER=yes +CONFIG_NSV_DEMUXER=yes +CONFIG_NUT_DEMUXER=yes +CONFIG_NUV_DEMUXER=yes +CONFIG_OGG_DEMUXER=yes +CONFIG_OMA_DEMUXER=yes +CONFIG_PAF_DEMUXER=yes +CONFIG_PCM_ALAW_DEMUXER=yes +CONFIG_PCM_MULAW_DEMUXER=yes +CONFIG_PCM_F64BE_DEMUXER=yes +CONFIG_PCM_F64LE_DEMUXER=yes +CONFIG_PCM_F32BE_DEMUXER=yes +CONFIG_PCM_F32LE_DEMUXER=yes +CONFIG_PCM_S32BE_DEMUXER=yes +CONFIG_PCM_S32LE_DEMUXER=yes +CONFIG_PCM_S24BE_DEMUXER=yes +CONFIG_PCM_S24LE_DEMUXER=yes +CONFIG_PCM_S16BE_DEMUXER=yes +CONFIG_PCM_S16LE_DEMUXER=yes +CONFIG_PCM_S8_DEMUXER=yes +CONFIG_PCM_U32BE_DEMUXER=yes +CONFIG_PCM_U32LE_DEMUXER=yes +CONFIG_PCM_U24BE_DEMUXER=yes +CONFIG_PCM_U24LE_DEMUXER=yes +CONFIG_PCM_U16BE_DEMUXER=yes +CONFIG_PCM_U16LE_DEMUXER=yes +CONFIG_PCM_U8_DEMUXER=yes +CONFIG_PJS_DEMUXER=yes +CONFIG_PMP_DEMUXER=yes +CONFIG_PVA_DEMUXER=yes +CONFIG_PVF_DEMUXER=yes +CONFIG_QCP_DEMUXER=yes +CONFIG_R3D_DEMUXER=yes +CONFIG_RAWVIDEO_DEMUXER=yes +CONFIG_REALTEXT_DEMUXER=yes +CONFIG_REDSPARK_DEMUXER=yes +CONFIG_RL2_DEMUXER=yes +CONFIG_RM_DEMUXER=yes +CONFIG_ROQ_DEMUXER=yes +CONFIG_RPL_DEMUXER=yes +CONFIG_RSD_DEMUXER=yes +CONFIG_RSO_DEMUXER=yes +!CONFIG_RTP_DEMUXER=yes +!CONFIG_RTSP_DEMUXER=yes +CONFIG_SAMI_DEMUXER=yes +!CONFIG_SAP_DEMUXER=yes +CONFIG_SBG_DEMUXER=yes +!CONFIG_SDP_DEMUXER=yes +CONFIG_SEGAFILM_DEMUXER=yes +CONFIG_SHORTEN_DEMUXER=yes +CONFIG_SIFF_DEMUXER=yes +CONFIG_SMACKER_DEMUXER=yes +CONFIG_SMJPEG_DEMUXER=yes +CONFIG_SMUSH_DEMUXER=yes +CONFIG_SOL_DEMUXER=yes +CONFIG_SOX_DEMUXER=yes +CONFIG_SPDIF_DEMUXER=yes +CONFIG_SRT_DEMUXER=yes +CONFIG_STR_DEMUXER=yes +CONFIG_SUBVIEWER1_DEMUXER=yes +CONFIG_SUBVIEWER_DEMUXER=yes +CONFIG_SWF_DEMUXER=yes +CONFIG_TAK_DEMUXER=yes +CONFIG_TEDCAPTIONS_DEMUXER=yes +CONFIG_THP_DEMUXER=yes +CONFIG_TIERTEXSEQ_DEMUXER=yes +CONFIG_TMV_DEMUXER=yes +CONFIG_TRUEHD_DEMUXER=yes +CONFIG_TTA_DEMUXER=yes +CONFIG_TXD_DEMUXER=yes +CONFIG_TTY_DEMUXER=yes +CONFIG_VC1_DEMUXER=yes +CONFIG_VC1T_DEMUXER=yes +CONFIG_VIVO_DEMUXER=yes +CONFIG_VMD_DEMUXER=yes +CONFIG_VOBSUB_DEMUXER=yes +CONFIG_VOC_DEMUXER=yes +CONFIG_VPLAYER_DEMUXER=yes +CONFIG_VQF_DEMUXER=yes +CONFIG_W64_DEMUXER=yes +CONFIG_WAV_DEMUXER=yes +CONFIG_WC3_DEMUXER=yes +CONFIG_WEBVTT_DEMUXER=yes +CONFIG_WSAUD_DEMUXER=yes +CONFIG_WSVQA_DEMUXER=yes +CONFIG_WTV_DEMUXER=yes +CONFIG_WV_DEMUXER=yes +CONFIG_XA_DEMUXER=yes +CONFIG_XBIN_DEMUXER=yes +CONFIG_XMV_DEMUXER=yes +CONFIG_XWMA_DEMUXER=yes +CONFIG_YOP_DEMUXER=yes +CONFIG_YUV4MPEGPIPE_DEMUXER=yes +!CONFIG_LIBGME_DEMUXER=yes +!CONFIG_LIBMODPLUG_DEMUXER=yes +!CONFIG_LIBNUT_DEMUXER=yes +!CONFIG_LIBQUVI_DEMUXER=yes +!CONFIG_A64MULTI_ENCODER=yes +!CONFIG_A64MULTI5_ENCODER=yes +!CONFIG_AMV_ENCODER=yes +!CONFIG_ASV1_ENCODER=yes +!CONFIG_ASV2_ENCODER=yes +!CONFIG_AVRP_ENCODER=yes +!CONFIG_AVUI_ENCODER=yes +!CONFIG_AYUV_ENCODER=yes +!CONFIG_BMP_ENCODER=yes +!CONFIG_CLJR_ENCODER=yes +!CONFIG_COMFORTNOISE_ENCODER=yes +!CONFIG_DNXHD_ENCODER=yes +!CONFIG_DPX_ENCODER=yes +!CONFIG_DVVIDEO_ENCODER=yes +!CONFIG_FFV1_ENCODER=yes +!CONFIG_FFVHUFF_ENCODER=yes +!CONFIG_FLASHSV_ENCODER=yes +!CONFIG_FLASHSV2_ENCODER=yes +!CONFIG_FLV_ENCODER=yes +!CONFIG_GIF_ENCODER=yes +!CONFIG_H261_ENCODER=yes +!CONFIG_H263_ENCODER=yes +!CONFIG_H263P_ENCODER=yes +!CONFIG_HUFFYUV_ENCODER=yes +!CONFIG_JPEG2000_ENCODER=yes +!CONFIG_JPEGLS_ENCODER=yes +!CONFIG_LJPEG_ENCODER=yes +!CONFIG_MJPEG_ENCODER=yes +!CONFIG_MPEG1VIDEO_ENCODER=yes +!CONFIG_MPEG2VIDEO_ENCODER=yes +!CONFIG_MPEG4_ENCODER=yes +!CONFIG_MSMPEG4V2_ENCODER=yes +!CONFIG_MSMPEG4V3_ENCODER=yes +!CONFIG_MSVIDEO1_ENCODER=yes +!CONFIG_PAM_ENCODER=yes +!CONFIG_PBM_ENCODER=yes +!CONFIG_PCX_ENCODER=yes +!CONFIG_PGM_ENCODER=yes +!CONFIG_PGMYUV_ENCODER=yes +!CONFIG_PNG_ENCODER=yes +!CONFIG_PPM_ENCODER=yes +!CONFIG_PRORES_ENCODER=yes +!CONFIG_PRORES_AW_ENCODER=yes +!CONFIG_PRORES_KS_ENCODER=yes +!CONFIG_QTRLE_ENCODER=yes +!CONFIG_R10K_ENCODER=yes +!CONFIG_R210_ENCODER=yes +!CONFIG_RAWVIDEO_ENCODER=yes +!CONFIG_ROQ_ENCODER=yes +!CONFIG_RV10_ENCODER=yes +!CONFIG_RV20_ENCODER=yes +!CONFIG_S302M_ENCODER=yes +!CONFIG_SGI_ENCODER=yes +!CONFIG_SNOW_ENCODER=yes +!CONFIG_SUNRAST_ENCODER=yes +!CONFIG_SVQ1_ENCODER=yes +!CONFIG_TARGA_ENCODER=yes +!CONFIG_TIFF_ENCODER=yes +!CONFIG_UTVIDEO_ENCODER=yes +!CONFIG_V210_ENCODER=yes +!CONFIG_V308_ENCODER=yes +!CONFIG_V408_ENCODER=yes +!CONFIG_V410_ENCODER=yes +!CONFIG_WMV1_ENCODER=yes +!CONFIG_WMV2_ENCODER=yes +!CONFIG_XBM_ENCODER=yes +!CONFIG_XFACE_ENCODER=yes +!CONFIG_XWD_ENCODER=yes +!CONFIG_Y41P_ENCODER=yes +!CONFIG_YUV4_ENCODER=yes +!CONFIG_ZLIB_ENCODER=yes +!CONFIG_ZMBV_ENCODER=yes +!CONFIG_AAC_ENCODER=yes +!CONFIG_AC3_ENCODER=yes +!CONFIG_AC3_FIXED_ENCODER=yes +!CONFIG_ALAC_ENCODER=yes +!CONFIG_DCA_ENCODER=yes +!CONFIG_EAC3_ENCODER=yes +!CONFIG_FLAC_ENCODER=yes +!CONFIG_G723_1_ENCODER=yes +!CONFIG_MP2_ENCODER=yes +!CONFIG_NELLYMOSER_ENCODER=yes +!CONFIG_RA_144_ENCODER=yes +!CONFIG_SONIC_ENCODER=yes +!CONFIG_SONIC_LS_ENCODER=yes +!CONFIG_TTA_ENCODER=yes +!CONFIG_VORBIS_ENCODER=yes +!CONFIG_WAVPACK_ENCODER=yes +!CONFIG_WMAV1_ENCODER=yes +!CONFIG_WMAV2_ENCODER=yes +!CONFIG_PCM_ALAW_ENCODER=yes +!CONFIG_PCM_F32BE_ENCODER=yes +!CONFIG_PCM_F32LE_ENCODER=yes +!CONFIG_PCM_F64BE_ENCODER=yes +!CONFIG_PCM_F64LE_ENCODER=yes +!CONFIG_PCM_MULAW_ENCODER=yes +!CONFIG_PCM_S8_ENCODER=yes +!CONFIG_PCM_S8_PLANAR_ENCODER=yes +!CONFIG_PCM_S16BE_ENCODER=yes +!CONFIG_PCM_S16BE_PLANAR_ENCODER=yes +!CONFIG_PCM_S16LE_ENCODER=yes +!CONFIG_PCM_S16LE_PLANAR_ENCODER=yes +!CONFIG_PCM_S24BE_ENCODER=yes +!CONFIG_PCM_S24DAUD_ENCODER=yes +!CONFIG_PCM_S24LE_ENCODER=yes +!CONFIG_PCM_S24LE_PLANAR_ENCODER=yes +!CONFIG_PCM_S32BE_ENCODER=yes +!CONFIG_PCM_S32LE_ENCODER=yes +!CONFIG_PCM_S32LE_PLANAR_ENCODER=yes +!CONFIG_PCM_U8_ENCODER=yes +!CONFIG_PCM_U16BE_ENCODER=yes +!CONFIG_PCM_U16LE_ENCODER=yes +!CONFIG_PCM_U24BE_ENCODER=yes +!CONFIG_PCM_U24LE_ENCODER=yes +!CONFIG_PCM_U32BE_ENCODER=yes +!CONFIG_PCM_U32LE_ENCODER=yes +!CONFIG_ROQ_DPCM_ENCODER=yes +!CONFIG_ADPCM_ADX_ENCODER=yes +!CONFIG_ADPCM_G722_ENCODER=yes +!CONFIG_ADPCM_G726_ENCODER=yes +!CONFIG_ADPCM_IMA_QT_ENCODER=yes +!CONFIG_ADPCM_IMA_WAV_ENCODER=yes +!CONFIG_ADPCM_MS_ENCODER=yes +!CONFIG_ADPCM_SWF_ENCODER=yes +!CONFIG_ADPCM_YAMAHA_ENCODER=yes +!CONFIG_SSA_ENCODER=yes +!CONFIG_ASS_ENCODER=yes +!CONFIG_DVBSUB_ENCODER=yes +!CONFIG_DVDSUB_ENCODER=yes +!CONFIG_MOVTEXT_ENCODER=yes +!CONFIG_SRT_ENCODER=yes +!CONFIG_SUBRIP_ENCODER=yes +!CONFIG_XSUB_ENCODER=yes +!CONFIG_LIBFAAC_ENCODER=yes +!CONFIG_LIBFDK_AAC_ENCODER=yes +!CONFIG_LIBGSM_ENCODER=yes +!CONFIG_LIBGSM_MS_ENCODER=yes +!CONFIG_LIBILBC_ENCODER=yes +!CONFIG_LIBMP3LAME_ENCODER=yes +!CONFIG_LIBOPENCORE_AMRNB_ENCODER=yes +!CONFIG_LIBOPENJPEG_ENCODER=yes +!CONFIG_LIBOPUS_ENCODER=yes +!CONFIG_LIBSCHROEDINGER_ENCODER=yes +!CONFIG_LIBSHINE_ENCODER=yes +!CONFIG_LIBSPEEX_ENCODER=yes +!CONFIG_LIBTHEORA_ENCODER=yes +!CONFIG_LIBTWOLAME_ENCODER=yes +!CONFIG_LIBUTVIDEO_ENCODER=yes +!CONFIG_LIBVO_AACENC_ENCODER=yes +!CONFIG_LIBVO_AMRWBENC_ENCODER=yes +!CONFIG_LIBVORBIS_ENCODER=yes +!CONFIG_LIBVPX_VP8_ENCODER=yes +!CONFIG_LIBVPX_VP9_ENCODER=yes +!CONFIG_LIBWAVPACK_ENCODER=yes +!CONFIG_LIBX264_ENCODER=yes +!CONFIG_LIBX264RGB_ENCODER=yes +!CONFIG_LIBXAVS_ENCODER=yes +!CONFIG_LIBXVID_ENCODER=yes +!CONFIG_LIBAACPLUS_ENCODER=yes +CONFIG_ACONVERT_FILTER=yes +CONFIG_ADELAY_FILTER=yes +CONFIG_AECHO_FILTER=yes +CONFIG_AFADE_FILTER=yes +CONFIG_AFORMAT_FILTER=yes +CONFIG_AINTERLEAVE_FILTER=yes +CONFIG_ALLPASS_FILTER=yes +CONFIG_AMERGE_FILTER=yes +CONFIG_AMIX_FILTER=yes +CONFIG_ANULL_FILTER=yes +CONFIG_APAD_FILTER=yes +CONFIG_APERMS_FILTER=yes +CONFIG_APHASER_FILTER=yes +CONFIG_ARESAMPLE_FILTER=yes +CONFIG_ASELECT_FILTER=yes +CONFIG_ASENDCMD_FILTER=yes +CONFIG_ASETNSAMPLES_FILTER=yes +CONFIG_ASETPTS_FILTER=yes +CONFIG_ASETRATE_FILTER=yes +CONFIG_ASETTB_FILTER=yes +CONFIG_ASHOWINFO_FILTER=yes +CONFIG_ASPLIT_FILTER=yes +CONFIG_ASTATS_FILTER=yes +CONFIG_ASTREAMSYNC_FILTER=yes +!CONFIG_ASYNCTS_FILTER=yes +CONFIG_ATEMPO_FILTER=yes +CONFIG_ATRIM_FILTER=yes +!CONFIG_AZMQ_FILTER=yes +CONFIG_BANDPASS_FILTER=yes +CONFIG_BANDREJECT_FILTER=yes +CONFIG_BASS_FILTER=yes +CONFIG_BIQUAD_FILTER=yes +CONFIG_CHANNELMAP_FILTER=yes +CONFIG_CHANNELSPLIT_FILTER=yes +CONFIG_COMPAND_FILTER=yes +CONFIG_EARWAX_FILTER=yes +CONFIG_EBUR128_FILTER=yes +CONFIG_EQUALIZER_FILTER=yes +CONFIG_HIGHPASS_FILTER=yes +CONFIG_JOIN_FILTER=yes +!CONFIG_LADSPA_FILTER=yes +CONFIG_LOWPASS_FILTER=yes +CONFIG_PAN_FILTER=yes +CONFIG_REPLAYGAIN_FILTER=yes +!CONFIG_RESAMPLE_FILTER=yes +CONFIG_SILENCEDETECT_FILTER=yes +CONFIG_TREBLE_FILTER=yes +CONFIG_VOLUME_FILTER=yes +CONFIG_VOLUMEDETECT_FILTER=yes +CONFIG_AEVALSRC_FILTER=yes +CONFIG_ANULLSRC_FILTER=yes +!CONFIG_FLITE_FILTER=yes +CONFIG_SINE_FILTER=yes +CONFIG_ANULLSINK_FILTER=yes +CONFIG_ALPHAEXTRACT_FILTER=yes +CONFIG_ALPHAMERGE_FILTER=yes +!CONFIG_ASS_FILTER=yes +CONFIG_BBOX_FILTER=yes +CONFIG_BLACKDETECT_FILTER=yes +CONFIG_BLACKFRAME_FILTER=yes +CONFIG_BLEND_FILTER=yes +CONFIG_BOXBLUR_FILTER=yes +CONFIG_COLORBALANCE_FILTER=yes +CONFIG_COLORCHANNELMIXER_FILTER=yes +CONFIG_COLORMATRIX_FILTER=yes +CONFIG_COPY_FILTER=yes +CONFIG_CROP_FILTER=yes +CONFIG_CROPDETECT_FILTER=yes +CONFIG_CURVES_FILTER=yes +CONFIG_DCTDNOIZ_FILTER=yes +CONFIG_DECIMATE_FILTER=yes +CONFIG_DELOGO_FILTER=yes +CONFIG_DESHAKE_FILTER=yes +CONFIG_DRAWBOX_FILTER=yes +CONFIG_DRAWGRID_FILTER=yes +!CONFIG_DRAWTEXT_FILTER=yes +CONFIG_EDGEDETECT_FILTER=yes +CONFIG_EXTRACTPLANES_FILTER=yes +CONFIG_FADE_FILTER=yes +CONFIG_FIELD_FILTER=yes +CONFIG_FIELDMATCH_FILTER=yes +CONFIG_FIELDORDER_FILTER=yes +CONFIG_FORMAT_FILTER=yes +CONFIG_FPS_FILTER=yes +CONFIG_FRAMESTEP_FILTER=yes +!CONFIG_FREI0R_FILTER=yes +CONFIG_GEQ_FILTER=yes +CONFIG_GRADFUN_FILTER=yes +CONFIG_HALDCLUT_FILTER=yes +CONFIG_HFLIP_FILTER=yes +CONFIG_HISTEQ_FILTER=yes +CONFIG_HISTOGRAM_FILTER=yes +CONFIG_HQDN3D_FILTER=yes +CONFIG_HUE_FILTER=yes +CONFIG_IDET_FILTER=yes +CONFIG_IL_FILTER=yes +CONFIG_INTERLACE_FILTER=yes +CONFIG_INTERLEAVE_FILTER=yes +CONFIG_KERNDEINT_FILTER=yes +CONFIG_LUT3D_FILTER=yes +CONFIG_LUT_FILTER=yes +CONFIG_LUTRGB_FILTER=yes +CONFIG_LUTYUV_FILTER=yes +CONFIG_MCDEINT_FILTER=yes +CONFIG_MERGEPLANES_FILTER=yes +CONFIG_MP_FILTER=yes +CONFIG_MPDECIMATE_FILTER=yes +CONFIG_NEGATE_FILTER=yes +CONFIG_NOFORMAT_FILTER=yes +CONFIG_NOISE_FILTER=yes +CONFIG_NULL_FILTER=yes +!CONFIG_OCV_FILTER=yes +CONFIG_OVERLAY_FILTER=yes +CONFIG_OWDENOISE_FILTER=yes +CONFIG_PAD_FILTER=yes +CONFIG_PERMS_FILTER=yes +CONFIG_PERSPECTIVE_FILTER=yes +CONFIG_PHASE_FILTER=yes +CONFIG_PIXDESCTEST_FILTER=yes +!CONFIG_PP_FILTER=yes +CONFIG_PSNR_FILTER=yes +CONFIG_PULLUP_FILTER=yes +CONFIG_REMOVELOGO_FILTER=yes +CONFIG_ROTATE_FILTER=yes +CONFIG_SAB_FILTER=yes +CONFIG_SCALE_FILTER=yes +CONFIG_SELECT_FILTER=yes +CONFIG_SENDCMD_FILTER=yes +CONFIG_SEPARATEFIELDS_FILTER=yes +CONFIG_SETDAR_FILTER=yes +CONFIG_SETFIELD_FILTER=yes +CONFIG_SETPTS_FILTER=yes +CONFIG_SETSAR_FILTER=yes +CONFIG_SETTB_FILTER=yes +CONFIG_SHOWINFO_FILTER=yes +CONFIG_SMARTBLUR_FILTER=yes +CONFIG_SPLIT_FILTER=yes +CONFIG_SPP_FILTER=yes +CONFIG_STEREO3D_FILTER=yes +!CONFIG_SUBTITLES_FILTER=yes +CONFIG_SUPER2XSAI_FILTER=yes +CONFIG_SWAPUV_FILTER=yes +CONFIG_TELECINE_FILTER=yes +CONFIG_THUMBNAIL_FILTER=yes +CONFIG_TILE_FILTER=yes +CONFIG_TINTERLACE_FILTER=yes +CONFIG_TRANSPOSE_FILTER=yes +CONFIG_TRIM_FILTER=yes +CONFIG_UNSHARP_FILTER=yes +CONFIG_VFLIP_FILTER=yes +!CONFIG_VIDSTABDETECT_FILTER=yes +!CONFIG_VIDSTABTRANSFORM_FILTER=yes +CONFIG_VIGNETTE_FILTER=yes +CONFIG_W3FDIF_FILTER=yes +CONFIG_YADIF_FILTER=yes +!CONFIG_ZMQ_FILTER=yes +CONFIG_CELLAUTO_FILTER=yes +CONFIG_COLOR_FILTER=yes +!CONFIG_FREI0R_SRC_FILTER=yes +CONFIG_HALDCLUTSRC_FILTER=yes +CONFIG_LIFE_FILTER=yes +CONFIG_MANDELBROT_FILTER=yes +CONFIG_MPTESTSRC_FILTER=yes +CONFIG_NULLSRC_FILTER=yes +CONFIG_RGBTESTSRC_FILTER=yes +CONFIG_SMPTEBARS_FILTER=yes +CONFIG_SMPTEHDBARS_FILTER=yes +CONFIG_TESTSRC_FILTER=yes +CONFIG_NULLSINK_FILTER=yes +CONFIG_AVECTORSCOPE_FILTER=yes +CONFIG_CONCAT_FILTER=yes +CONFIG_SHOWSPECTRUM_FILTER=yes +CONFIG_SHOWWAVES_FILTER=yes +CONFIG_AMOVIE_FILTER=yes +CONFIG_MOVIE_FILTER=yes +!CONFIG_H263_VAAPI_HWACCEL=yes +!CONFIG_H263_VDPAU_HWACCEL=yes +!CONFIG_H264_DXVA2_HWACCEL=yes +!CONFIG_H264_VAAPI_HWACCEL=yes +!CONFIG_H264_VDA_HWACCEL=yes +!CONFIG_H264_VDPAU_HWACCEL=yes +!CONFIG_MPEG1_VDPAU_HWACCEL=yes +!CONFIG_MPEG2_DXVA2_HWACCEL=yes +!CONFIG_MPEG2_VAAPI_HWACCEL=yes +!CONFIG_MPEG2_VDPAU_HWACCEL=yes +!CONFIG_MPEG4_VAAPI_HWACCEL=yes +!CONFIG_MPEG4_VDPAU_HWACCEL=yes +!CONFIG_VC1_DXVA2_HWACCEL=yes +!CONFIG_VC1_VAAPI_HWACCEL=yes +!CONFIG_VC1_VDPAU_HWACCEL=yes +!CONFIG_WMV3_DXVA2_HWACCEL=yes +!CONFIG_WMV3_VAAPI_HWACCEL=yes +!CONFIG_WMV3_VDPAU_HWACCEL=yes +!CONFIG_ALSA_INDEV=yes +!CONFIG_BKTR_INDEV=yes +!CONFIG_DSHOW_INDEV=yes +!CONFIG_DV1394_INDEV=yes +!CONFIG_FBDEV_INDEV=yes +!CONFIG_IEC61883_INDEV=yes +!CONFIG_JACK_INDEV=yes +!CONFIG_LAVFI_INDEV=yes +!CONFIG_OPENAL_INDEV=yes +!CONFIG_OSS_INDEV=yes +!CONFIG_PULSE_INDEV=yes +!CONFIG_SNDIO_INDEV=yes +!CONFIG_V4L2_INDEV=yes +!CONFIG_VFWCAP_INDEV=yes +!CONFIG_X11GRAB_INDEV=yes +!CONFIG_LIBCDIO_INDEV=yes +!CONFIG_LIBDC1394_INDEV=yes +!CONFIG_A64_MUXER=yes +!CONFIG_AC3_MUXER=yes +!CONFIG_ADTS_MUXER=yes +!CONFIG_ADX_MUXER=yes +!CONFIG_AIFF_MUXER=yes +!CONFIG_AMR_MUXER=yes +!CONFIG_ASF_MUXER=yes +!CONFIG_ASS_MUXER=yes +!CONFIG_AST_MUXER=yes +!CONFIG_ASF_STREAM_MUXER=yes +!CONFIG_AU_MUXER=yes +!CONFIG_AVI_MUXER=yes +!CONFIG_AVM2_MUXER=yes +!CONFIG_BIT_MUXER=yes +!CONFIG_CAF_MUXER=yes +!CONFIG_CAVSVIDEO_MUXER=yes +!CONFIG_CRC_MUXER=yes +!CONFIG_DATA_MUXER=yes +!CONFIG_DAUD_MUXER=yes +!CONFIG_DIRAC_MUXER=yes +!CONFIG_DNXHD_MUXER=yes +!CONFIG_DTS_MUXER=yes +!CONFIG_DV_MUXER=yes +!CONFIG_EAC3_MUXER=yes +!CONFIG_F4V_MUXER=yes +!CONFIG_FFM_MUXER=yes +!CONFIG_FFMETADATA_MUXER=yes +!CONFIG_FILMSTRIP_MUXER=yes +!CONFIG_FLAC_MUXER=yes +!CONFIG_FLV_MUXER=yes +!CONFIG_FRAMECRC_MUXER=yes +!CONFIG_FRAMEMD5_MUXER=yes +!CONFIG_G722_MUXER=yes +!CONFIG_G723_1_MUXER=yes +!CONFIG_GIF_MUXER=yes +!CONFIG_GXF_MUXER=yes +!CONFIG_H261_MUXER=yes +!CONFIG_H263_MUXER=yes +!CONFIG_H264_MUXER=yes +!CONFIG_HLS_MUXER=yes +!CONFIG_ICO_MUXER=yes +!CONFIG_ILBC_MUXER=yes +!CONFIG_IMAGE2_MUXER=yes +!CONFIG_IMAGE2PIPE_MUXER=yes +!CONFIG_IPOD_MUXER=yes +!CONFIG_IRCAM_MUXER=yes +!CONFIG_ISMV_MUXER=yes +!CONFIG_IVF_MUXER=yes +!CONFIG_JACOSUB_MUXER=yes +!CONFIG_LATM_MUXER=yes +!CONFIG_M4V_MUXER=yes +!CONFIG_MD5_MUXER=yes +!CONFIG_MATROSKA_MUXER=yes +!CONFIG_MATROSKA_AUDIO_MUXER=yes +!CONFIG_MICRODVD_MUXER=yes +!CONFIG_MJPEG_MUXER=yes +!CONFIG_MLP_MUXER=yes +!CONFIG_MMF_MUXER=yes +!CONFIG_MOV_MUXER=yes +!CONFIG_MP2_MUXER=yes +!CONFIG_MP3_MUXER=yes +!CONFIG_MP4_MUXER=yes +!CONFIG_MPEG1SYSTEM_MUXER=yes +!CONFIG_MPEG1VCD_MUXER=yes +!CONFIG_MPEG1VIDEO_MUXER=yes +!CONFIG_MPEG2DVD_MUXER=yes +!CONFIG_MPEG2SVCD_MUXER=yes +!CONFIG_MPEG2VIDEO_MUXER=yes +!CONFIG_MPEG2VOB_MUXER=yes +!CONFIG_MPEGTS_MUXER=yes +!CONFIG_MPJPEG_MUXER=yes +!CONFIG_MXF_MUXER=yes +!CONFIG_MXF_D10_MUXER=yes +!CONFIG_NULL_MUXER=yes +!CONFIG_NUT_MUXER=yes +!CONFIG_OGG_MUXER=yes +!CONFIG_OMA_MUXER=yes +!CONFIG_PCM_ALAW_MUXER=yes +!CONFIG_PCM_MULAW_MUXER=yes +!CONFIG_PCM_F64BE_MUXER=yes +!CONFIG_PCM_F64LE_MUXER=yes +!CONFIG_PCM_F32BE_MUXER=yes +!CONFIG_PCM_F32LE_MUXER=yes +!CONFIG_PCM_S32BE_MUXER=yes +!CONFIG_PCM_S32LE_MUXER=yes +!CONFIG_PCM_S24BE_MUXER=yes +!CONFIG_PCM_S24LE_MUXER=yes +!CONFIG_PCM_S16BE_MUXER=yes +!CONFIG_PCM_S16LE_MUXER=yes +!CONFIG_PCM_S8_MUXER=yes +!CONFIG_PCM_U32BE_MUXER=yes +!CONFIG_PCM_U32LE_MUXER=yes +!CONFIG_PCM_U24BE_MUXER=yes +!CONFIG_PCM_U24LE_MUXER=yes +!CONFIG_PCM_U16BE_MUXER=yes +!CONFIG_PCM_U16LE_MUXER=yes +!CONFIG_PCM_U8_MUXER=yes +!CONFIG_PSP_MUXER=yes +!CONFIG_RAWVIDEO_MUXER=yes +!CONFIG_RM_MUXER=yes +!CONFIG_ROQ_MUXER=yes +!CONFIG_RSO_MUXER=yes +!CONFIG_RTP_MUXER=yes +!CONFIG_RTSP_MUXER=yes +!CONFIG_SAP_MUXER=yes +!CONFIG_SEGMENT_MUXER=yes +!CONFIG_STREAM_SEGMENT_MUXER=yes +!CONFIG_SMJPEG_MUXER=yes +!CONFIG_SMOOTHSTREAMING_MUXER=yes +!CONFIG_SOX_MUXER=yes +!CONFIG_SPDIF_MUXER=yes +!CONFIG_SRT_MUXER=yes +!CONFIG_SWF_MUXER=yes +!CONFIG_TEE_MUXER=yes +!CONFIG_TG2_MUXER=yes +!CONFIG_TGP_MUXER=yes +!CONFIG_MKVTIMESTAMP_V2_MUXER=yes +!CONFIG_TRUEHD_MUXER=yes +!CONFIG_VC1_MUXER=yes +!CONFIG_VC1T_MUXER=yes +!CONFIG_VOC_MUXER=yes +!CONFIG_W64_MUXER=yes +!CONFIG_WAV_MUXER=yes +!CONFIG_WEBM_MUXER=yes +!CONFIG_WEBVTT_MUXER=yes +!CONFIG_WTV_MUXER=yes +!CONFIG_WV_MUXER=yes +!CONFIG_YUV4MPEGPIPE_MUXER=yes +!CONFIG_LIBNUT_MUXER=yes +!CONFIG_ALSA_OUTDEV=yes +!CONFIG_CACA_OUTDEV=yes +!CONFIG_FBDEV_OUTDEV=yes +!CONFIG_OSS_OUTDEV=yes +!CONFIG_PULSE_OUTDEV=yes +!CONFIG_SDL_OUTDEV=yes +!CONFIG_SNDIO_OUTDEV=yes +!CONFIG_V4L2_OUTDEV=yes +!CONFIG_XV_OUTDEV=yes +CONFIG_AAC_PARSER=yes +CONFIG_AAC_LATM_PARSER=yes +CONFIG_AC3_PARSER=yes +CONFIG_ADX_PARSER=yes +CONFIG_BMP_PARSER=yes +CONFIG_CAVSVIDEO_PARSER=yes +CONFIG_COOK_PARSER=yes +CONFIG_DCA_PARSER=yes +CONFIG_DIRAC_PARSER=yes +CONFIG_DNXHD_PARSER=yes +CONFIG_DPX_PARSER=yes +CONFIG_DVBSUB_PARSER=yes +CONFIG_DVDSUB_PARSER=yes +CONFIG_DVD_NAV_PARSER=yes +CONFIG_FLAC_PARSER=yes +CONFIG_GSM_PARSER=yes +CONFIG_H261_PARSER=yes +CONFIG_H263_PARSER=yes +CONFIG_H264_PARSER=yes +CONFIG_HEVC_PARSER=yes +CONFIG_MJPEG_PARSER=yes +CONFIG_MLP_PARSER=yes +CONFIG_MPEG4VIDEO_PARSER=yes +CONFIG_MPEGAUDIO_PARSER=yes +CONFIG_MPEGVIDEO_PARSER=yes +CONFIG_PNG_PARSER=yes +CONFIG_PNM_PARSER=yes +CONFIG_RV30_PARSER=yes +CONFIG_RV40_PARSER=yes +CONFIG_TAK_PARSER=yes +CONFIG_VC1_PARSER=yes +CONFIG_VORBIS_PARSER=yes +CONFIG_VP3_PARSER=yes +CONFIG_VP8_PARSER=yes +!CONFIG_BLURAY_PROTOCOL=yes +!CONFIG_CACHE_PROTOCOL=yes +!CONFIG_CONCAT_PROTOCOL=yes +!CONFIG_CRYPTO_PROTOCOL=yes +!CONFIG_DATA_PROTOCOL=yes +!CONFIG_FFRTMPCRYPT_PROTOCOL=yes +!CONFIG_FFRTMPHTTP_PROTOCOL=yes +CONFIG_FILE_PROTOCOL=yes +!CONFIG_FTP_PROTOCOL=yes +!CONFIG_GOPHER_PROTOCOL=yes +!CONFIG_HLS_PROTOCOL=yes +!CONFIG_HTTP_PROTOCOL=yes +!CONFIG_HTTPPROXY_PROTOCOL=yes +!CONFIG_HTTPS_PROTOCOL=yes +!CONFIG_MMSH_PROTOCOL=yes +!CONFIG_MMST_PROTOCOL=yes +!CONFIG_MD5_PROTOCOL=yes +!CONFIG_PIPE_PROTOCOL=yes +!CONFIG_RTMP_PROTOCOL=yes +!CONFIG_RTMPE_PROTOCOL=yes +!CONFIG_RTMPS_PROTOCOL=yes +!CONFIG_RTMPT_PROTOCOL=yes +!CONFIG_RTMPTE_PROTOCOL=yes +!CONFIG_RTMPTS_PROTOCOL=yes +!CONFIG_RTP_PROTOCOL=yes +!CONFIG_SCTP_PROTOCOL=yes +!CONFIG_SRTP_PROTOCOL=yes +!CONFIG_TCP_PROTOCOL=yes +!CONFIG_TLS_PROTOCOL=yes +!CONFIG_UDP_PROTOCOL=yes +!CONFIG_UNIX_PROTOCOL=yes +!CONFIG_LIBRTMP_PROTOCOL=yes +!CONFIG_LIBRTMPE_PROTOCOL=yes +!CONFIG_LIBRTMPS_PROTOCOL=yes +!CONFIG_LIBRTMPT_PROTOCOL=yes +!CONFIG_LIBRTMPTE_PROTOCOL=yes +!CONFIG_LIBSSH_PROTOCOL=yes +endif # FFMPEG_CONFIG_MAK diff --git a/contrib/sdk/sources/ffmpeg/configure b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/configure similarity index 100% rename from contrib/sdk/sources/ffmpeg/configure rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/configure diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/ffmpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg.c diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/ffmpeg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg.h diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg_filter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg_filter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/ffmpeg_filter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg_filter.c diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg_opt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg_opt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/ffmpeg_opt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffmpeg_opt.c diff --git a/contrib/sdk/sources/ffmpeg/ffplay.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffplay.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/ffplay.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffplay.c diff --git a/contrib/sdk/sources/ffmpeg/ffprobe.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffprobe.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/ffprobe.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffprobe.c diff --git a/contrib/sdk/sources/ffmpeg/ffserver.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffserver.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/ffserver.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/ffserver.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/012v.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/012v.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/012v.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/012v.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/4xm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/4xm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/4xm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/4xm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/8bps.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/8bps.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/8bps.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/8bps.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/8svx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/8svx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/8svx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/8svx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/a64colors.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/a64colors.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/a64colors.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/a64colors.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/a64multienc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/a64multienc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/a64multienc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/a64multienc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/a64tables.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/a64tables.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/a64tables.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/a64tables.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac_ac3_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_ac3_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac_ac3_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_ac3_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac_ac3_parser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_ac3_parser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac_ac3_parser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_ac3_parser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac_adtstoasc_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_adtstoasc_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac_adtstoasc_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_adtstoasc_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aac_tablegen_decl.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_tablegen_decl.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aac_tablegen_decl.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aac_tablegen_decl.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacadtsdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacadtsdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacadtsdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacadtsdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacadtsdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacadtsdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacadtsdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacadtsdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aaccoder.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aaccoder.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aaccoder.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aaccoder.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacdectab.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacdectab.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacdectab.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacdectab.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacps.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacps.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacps.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacps.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacps_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacps_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacps_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacps_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacps_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacpsdata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsdata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacpsdata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsdata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacpsdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacpsdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacpsdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacpsdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacpsy.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsy.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacpsy.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacpsy.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacsbr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacsbr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacsbr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacsbr.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacsbr.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacsbr.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacsbr.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacsbr.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aacsbrdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacsbrdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aacsbrdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aacsbrdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aactab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aactab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aactab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aactab.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aactab.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aactab.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aactab.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aactab.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aandcttab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aandcttab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aandcttab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aandcttab.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aandcttab.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aandcttab.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aandcttab.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aandcttab.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aasc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aasc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aasc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aasc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3_parser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3_parser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3_parser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3_parser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3dec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3dec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3dec_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3dec_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3dec_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3dec_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dec_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3enc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3enc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_fixed.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_fixed.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_fixed.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_fixed.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_float.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_float.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_float.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_float.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_opts_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_opts_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_opts_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_opts_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3enc_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3enc_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3tab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3tab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3tab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3tab.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ac3tab.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3tab.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ac3tab.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ac3tab.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/acelp_filters.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_filters.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/acelp_filters.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_filters.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/acelp_filters.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_filters.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/acelp_filters.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_filters.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/acelp_pitch_delay.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_pitch_delay.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/acelp_pitch_delay.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_pitch_delay.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/acelp_pitch_delay.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_pitch_delay.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/acelp_pitch_delay.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_pitch_delay.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/acelp_vectors.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_vectors.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/acelp_vectors.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_vectors.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/acelp_vectors.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_vectors.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/acelp_vectors.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/acelp_vectors.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adpcm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adpcm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adpcm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adpcm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adpcm_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adpcm_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adpcm_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adpcm_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcm_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adpcmenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcmenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adpcmenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adpcmenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adx.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adx.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adx.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adx.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adx_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adx_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adx_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adx_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adxdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adxdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adxdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adxdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/adxenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adxenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/adxenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/adxenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aic.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aic.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aic.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aic.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alac_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alac_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alac_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alac_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alac_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alac_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alac_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alac_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alacenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alacenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alacenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alacenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/allcodecs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/allcodecs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/allcodecs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/allcodecs.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/asm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/asm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/asm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/asm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/dsputil_alpha.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/dsputil_alpha.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/dsputil_alpha.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/dsputil_alpha.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/dsputil_alpha.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/dsputil_alpha.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/dsputil_alpha.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/dsputil_alpha.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/dsputil_alpha_asm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/dsputil_alpha_asm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/dsputil_alpha_asm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/hpeldsp_alpha.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/hpeldsp_alpha.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/hpeldsp_alpha.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/hpeldsp_alpha.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/hpeldsp_alpha.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/hpeldsp_alpha.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/hpeldsp_alpha.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/hpeldsp_alpha.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/hpeldsp_alpha_asm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/hpeldsp_alpha_asm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/hpeldsp_alpha_asm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/hpeldsp_alpha_asm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/motion_est_alpha.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/motion_est_alpha.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/motion_est_alpha.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/motion_est_alpha.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/motion_est_mvi_asm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/motion_est_mvi_asm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/motion_est_mvi_asm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/mpegvideo_alpha.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/mpegvideo_alpha.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/mpegvideo_alpha.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/mpegvideo_alpha.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/regdef.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/regdef.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/regdef.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/regdef.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alpha/simple_idct_alpha.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/simple_idct_alpha.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alpha/simple_idct_alpha.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alpha/simple_idct_alpha.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/alsdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alsdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/alsdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/alsdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/amr.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amr.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/amr.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amr.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/amrnbdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrnbdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/amrnbdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrnbdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/amrnbdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrnbdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/amrnbdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrnbdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/amrwbdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrwbdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/amrwbdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrwbdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/amrwbdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrwbdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/amrwbdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/amrwbdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/anm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/anm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/anm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/anm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ansi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ansi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ansi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ansi.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/apedec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/apedec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/apedec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/apedec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/aac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/aac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/aac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/aac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/aacpsdsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/aacpsdsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/aacpsdsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/aacpsdsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/aacpsdsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/aacpsdsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/aacpsdsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/aacpsdsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_arm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_arm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_arm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_arm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/ac3dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/ac3dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/asm-offsets.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/asm-offsets.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/asm-offsets.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/asm-offsets.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dca.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dca.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dca.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dca.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dcadsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dcadsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dcadsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dcadsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dcadsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dcadsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dcadsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dcadsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dcadsp_vfp.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dcadsp_vfp.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dcadsp_vfp.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dcadsp_vfp.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_arm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_arm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_arm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_arm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_arm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_arm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_arm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_arm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_armv5te.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_armv5te.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_armv5te.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_armv5te.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_armv6.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_armv6.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_armv6.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_armv6.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_neon.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_neon.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_init_neon.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_init_neon.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/dsputil_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/dsputil_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_fixed_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_fixed_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_fixed_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_fixed_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_fixed_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_fixed_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_fixed_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_fixed_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_vfp.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_vfp.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fft_vfp.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fft_vfp.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/flacdsp_arm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/flacdsp_arm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/flacdsp_arm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/flacdsp_arm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/flacdsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/flacdsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/flacdsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/flacdsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_vfp.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_vfp.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_vfp.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_vfp.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_vfp_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_vfp_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/fmtconvert_vfp_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/fmtconvert_vfp_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264chroma_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264chroma_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264chroma_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264chroma_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264cmc_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264cmc_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264cmc_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264cmc_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264dsp_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264dsp_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264dsp_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264dsp_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264idct_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264idct_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264idct_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264idct_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264pred_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264pred_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264pred_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264pred_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264pred_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264pred_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264pred_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264pred_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264qpel_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264qpel_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264qpel_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264qpel_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/h264qpel_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264qpel_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/h264qpel_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/h264qpel_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_arm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_arm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_arm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_arm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_arm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_arm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_arm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_arm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_init_armv6.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_init_armv6.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_init_armv6.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_init_armv6.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_init_neon.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_init_neon.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_init_neon.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_init_neon.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/hpeldsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/hpeldsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/int_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/int_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/int_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/int_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/jrevdct_arm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/jrevdct_arm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/jrevdct_arm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/jrevdct_arm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mathops.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mathops.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mathops.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mathops.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mdct_fixed_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mdct_fixed_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mdct_fixed_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mdct_fixed_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mdct_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mdct_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mdct_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mdct_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mdct_vfp.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mdct_vfp.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mdct_vfp.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mdct_vfp.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegaudiodsp_fixed_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegaudiodsp_fixed_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegaudiodsp_fixed_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegaudiodsp_fixed_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegaudiodsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegaudiodsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegaudiodsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegaudiodsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_arm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_arm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_arm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_arm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_armv5te.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_armv5te.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_armv5te.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_armv5te.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_armv5te_s.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_armv5te_s.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_armv5te_s.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_armv5te_s.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/mpegvideo_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/mpegvideo_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/rdft_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rdft_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/rdft_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rdft_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/rv34dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv34dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/rv34dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv34dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/rv34dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv34dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/rv34dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv34dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/rv40dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv40dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/rv40dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv40dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/rv40dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv40dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/rv40dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/rv40dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/sbrdsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/sbrdsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/sbrdsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/sbrdsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/sbrdsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/sbrdsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/sbrdsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/sbrdsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_arm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_arm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_arm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_arm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_armv5te.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_armv5te.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_armv5te.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_armv5te.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/simple_idct_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/simple_idct_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/synth_filter_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/synth_filter_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/synth_filter_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/synth_filter_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/synth_filter_vfp.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/synth_filter_vfp.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/synth_filter_vfp.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/synth_filter_vfp.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_arm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_arm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_arm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_arm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_armv5te.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_armv5te.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_armv5te.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_armv5te.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_init_armv5te.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_init_armv5te.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/videodsp_init_armv5te.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/videodsp_init_armv5te.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vorbisdsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vorbisdsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vorbisdsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vorbisdsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vorbisdsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vorbisdsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vorbisdsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vorbisdsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp3dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp3dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp3dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp3dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp3dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp3dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp3dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp3dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp56_arith.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp56_arith.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp56_arith.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp56_arith.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp6dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp6dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp6dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp6dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp6dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp6dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp6dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp6dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_armv6.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_armv6.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_armv6.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_armv6.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_init_armv6.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_init_armv6.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_init_armv6.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_init_armv6.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_init_neon.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_init_neon.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_init_neon.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_init_neon.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/arm/vp8dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/arm/vp8dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ass.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ass.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ass.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ass.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ass_split.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass_split.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ass_split.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass_split.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ass_split.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass_split.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ass_split.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ass_split.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/assdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/assdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/assdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/assdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/assenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/assenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/assenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/assenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/asv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/asv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/asv.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asv.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/asv.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asv.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/asvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/asvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/asvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/asvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/asvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/atrac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/atrac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/atrac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/atrac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/atrac1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/atrac1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/atrac1data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac1data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/atrac1data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac1data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/atrac3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/atrac3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac3.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/atrac3data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac3data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/atrac3data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/atrac3data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/audio_frame_queue.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audio_frame_queue.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/audio_frame_queue.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audio_frame_queue.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/audio_frame_queue.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audio_frame_queue.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/audio_frame_queue.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audio_frame_queue.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/audioconvert.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audioconvert.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/audioconvert.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audioconvert.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/audioconvert.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audioconvert.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/audioconvert.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/audioconvert.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/aura.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aura.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/aura.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/aura.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avcodec-55.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avcodec-55.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avcodec-55.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avcodec-55.def diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avcodec-55.orig.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avcodec-55.orig.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avcodec-55.orig.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avcodec-55.orig.def diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avcodec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avcodec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avcodec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avcodec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avfft.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avfft.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avfft.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avfft.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avfft.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avfft.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avfft.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avfft.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avpacket.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avpacket.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avpacket.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avpacket.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avpicture.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avpicture.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avpicture.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avpicture.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avr32/mathops.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avr32/mathops.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avr32/mathops.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avr32/mathops.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avrndec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avrndec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avrndec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avrndec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avs.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avuidec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avuidec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avuidec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avuidec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/avuienc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avuienc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/avuienc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/avuienc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bethsoftvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bethsoftvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bethsoftvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bethsoftvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bethsoftvideo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bethsoftvideo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bethsoftvideo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bethsoftvideo.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfi.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/config_bfin.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/config_bfin.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/config_bfin.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/config_bfin.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/dsputil_bfin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/dsputil_bfin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/dsputil_bfin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/dsputil_bfin.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/dsputil_bfin.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/dsputil_bfin.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/dsputil_bfin.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/dsputil_bfin.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/fdct_bfin.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/fdct_bfin.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/fdct_bfin.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/fdct_bfin.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/hpel_pixels_bfin.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/hpel_pixels_bfin.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/hpel_pixels_bfin.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/hpel_pixels_bfin.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/hpeldsp_bfin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/hpeldsp_bfin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/hpeldsp_bfin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/hpeldsp_bfin.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/hpeldsp_bfin.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/hpeldsp_bfin.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/hpeldsp_bfin.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/hpeldsp_bfin.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/idct_bfin.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/idct_bfin.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/idct_bfin.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/idct_bfin.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/mathops.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/mathops.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/mathops.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/mathops.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/mpegvideo_bfin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/mpegvideo_bfin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/mpegvideo_bfin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/mpegvideo_bfin.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/pixels_bfin.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/pixels_bfin.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/pixels_bfin.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/pixels_bfin.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/vp3_bfin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/vp3_bfin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/vp3_bfin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/vp3_bfin.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/vp3_bfin.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/vp3_bfin.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/vp3_bfin.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/vp3_bfin.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bfin/vp3_idct_bfin.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/vp3_idct_bfin.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bfin/vp3_idct_bfin.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bfin/vp3_idct_bfin.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bgmc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bgmc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bgmc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bgmc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bgmc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bgmc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bgmc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bgmc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bink.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bink.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bink.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bink.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/binkaudio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkaudio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/binkaudio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkaudio.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/binkdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/binkdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/binkdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/binkdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/binkdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/binkdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/binkdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bintext.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bintext.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bintext.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bintext.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bintext.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bintext.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bintext.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bintext.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bit_depth_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bit_depth_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bit_depth_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bit_depth_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bitstream.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bitstream.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bitstream.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bitstream.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bitstream_filter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bitstream_filter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bitstream_filter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bitstream_filter.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bmp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bmp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bmp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bmp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bmp_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmp_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bmp_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmp_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bmpenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmpenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bmpenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmpenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bmv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bmv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bmv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/brender_pix.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/brender_pix.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/brender_pix.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/brender_pix.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/bytestream.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bytestream.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/bytestream.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/bytestream.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/c93.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/c93.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/c93.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/c93.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cabac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cabac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cabac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cabac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cabac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cabac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cabac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cabac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cabac_functions.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cabac_functions.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cabac_functions.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cabac_functions.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cavs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cavs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavs.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cavs.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavs.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cavs.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavs.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cavs_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavs_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cavs_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavs_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cavsdata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cavsdata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cavsdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cavsdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cavsdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cavsdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cavsdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cavsdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cavsdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cbrt_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cbrt_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cbrt_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cbrt_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cbrt_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cbrt_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cbrt_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cbrt_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cdgraphics.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdgraphics.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cdgraphics.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdgraphics.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cdxl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdxl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cdxl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cdxl.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/celp_filters.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_filters.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/celp_filters.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_filters.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/celp_filters.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_filters.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/celp_filters.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_filters.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/celp_math.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_math.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/celp_math.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_math.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/celp_math.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_math.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/celp_math.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/celp_math.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cga_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cga_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cga_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cga_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cga_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cga_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cga_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cga_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/chomp_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/chomp_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/chomp_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/chomp_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cinepak.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cinepak.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cinepak.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cinepak.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cljr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cljr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cljr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cljr.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cllc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cllc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cllc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cllc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cngdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cngdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cngdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cngdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cngenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cngenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cngenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cngenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/codec_desc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/codec_desc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/codec_desc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/codec_desc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cook.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cook.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cook.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cook.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cook_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cook_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cook_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cook_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cookdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cookdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cookdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cookdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/copy_block.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/copy_block.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/copy_block.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/copy_block.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cos_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cos_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cos_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cos_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cpia.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cpia.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cpia.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cpia.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/crystalhd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/crystalhd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/crystalhd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/crystalhd.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cscd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cscd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cscd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cscd.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/cyuv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cyuv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/cyuv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/cyuv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dca.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dca.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dca.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dca.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dca.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dca.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dca.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dca.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dca_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dca_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dca_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dca_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dcadata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dcadata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dcadec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dcadec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dcadsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dcadsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dcadsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dcadsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcadsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dcaenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcaenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dcaenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcaenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dcaenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcaenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dcaenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcaenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dcahuff.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcahuff.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dcahuff.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dcahuff.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dct-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dct-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dct.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dct.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dct32.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dct32.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dct32.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dct32.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dct32_fixed.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32_fixed.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dct32_fixed.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32_fixed.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dct32_float.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32_float.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dct32_float.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dct32_float.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dctref.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dctref.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dctref.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dctref.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dctref.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dctref.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dctref.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dctref.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dfa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dfa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dfa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dfa.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dirac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dirac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dirac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dirac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dirac_arith.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_arith.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dirac_arith.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_arith.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dirac_arith.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_arith.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dirac_arith.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_arith.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dirac_dwt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_dwt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dirac_dwt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_dwt.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dirac_dwt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_dwt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dirac_dwt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_dwt.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dirac_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dirac_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dirac_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/diracdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/diracdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/diracdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/diracdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/diracdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/diracdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/diracdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/diracdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/diracdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/diracdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/diracdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/diracdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dnxhd_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhd_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dnxhd_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhd_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dnxhddata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhddata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dnxhddata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhddata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dnxhddata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhddata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dnxhddata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhddata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dnxhddec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhddec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dnxhddec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhddec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dnxhdenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhdenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dnxhdenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhdenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dnxhdenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhdenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dnxhdenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dnxhdenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dpcm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpcm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dpcm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpcm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dpx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dpx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dpx_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpx_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dpx_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpx_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dpxenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpxenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dpxenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dpxenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dsicinav.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsicinav.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dsicinav.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsicinav.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dsputil.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsputil.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dsputil.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsputil.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dsputil.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsputil.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dsputil.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsputil.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dsputil_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsputil_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dsputil_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dsputil_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dump_extradata_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dump_extradata_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dump_extradata_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dump_extradata_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dv_profile.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_profile.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dv_profile.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_profile.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dv_profile.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_profile.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dv_profile.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_profile.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dv_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dv_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dv_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dv_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dv_vlc_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_vlc_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dv_vlc_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dv_vlc_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvbsub.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvbsub.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvbsub.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvbsub.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvbsub_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvbsub_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvbsub_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvbsub_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvbsubdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvbsubdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvbsubdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvbsubdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvd_nav_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvd_nav_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvd_nav_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvd_nav_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvdata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvdata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvdsub_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdsub_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvdsub_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdsub_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvdsubdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdsubdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvdsubdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdsubdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dvdsubenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdsubenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dvdsubenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dvdsubenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxa.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxtory.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxtory.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxtory.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxtory.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxva2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxva2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxva2.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxva2.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxva2_h264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_h264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxva2_h264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_h264.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxva2_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxva2_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxva2_mpeg2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_mpeg2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxva2_mpeg2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_mpeg2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/dxva2_vc1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_vc1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/dxva2_vc1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/dxva2_vc1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eac3_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eac3_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eac3_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eac3_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eac3dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eac3dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eac3enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eac3enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eac3enc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3enc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eac3enc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eac3enc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eacmv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eacmv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eacmv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eacmv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eaidct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eaidct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eaidct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eaidct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eaidct.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eaidct.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eaidct.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eaidct.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eamad.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eamad.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eamad.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eamad.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eatgq.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eatgq.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eatgq.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eatgq.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eatgv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eatgv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eatgv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eatgv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/eatqi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eatqi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/eatqi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/eatqi.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/elbg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/elbg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/elbg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/elbg.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/elbg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/elbg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/elbg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/elbg.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/error_resilience.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/error_resilience.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/error_resilience.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/error_resilience.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/error_resilience.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/error_resilience.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/error_resilience.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/error_resilience.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/escape124.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/escape124.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/escape124.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/escape124.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/escape130.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/escape130.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/escape130.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/escape130.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/evrcdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/evrcdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/evrcdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/evrcdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/evrcdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/evrcdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/evrcdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/evrcdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/exif.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/exif.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/exif.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/exif.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/exif.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/exif.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/exif.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/exif.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/exr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/exr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/exr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/exr.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/faandct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faandct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/faandct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faandct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/faandct.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faandct.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/faandct.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faandct.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/faanidct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faanidct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/faanidct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faanidct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/faanidct.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faanidct.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/faanidct.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faanidct.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/faxcompr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faxcompr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/faxcompr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faxcompr.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/faxcompr.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faxcompr.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/faxcompr.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/faxcompr.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft-fixed-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-fixed-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft-fixed-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-fixed-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft-fixed32-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-fixed32-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft-fixed32-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-fixed32-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft-internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft-internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft_fixed.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_fixed.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft_fixed.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_fixed.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft_fixed_32.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_fixed_32.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft_fixed_32.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_fixed_32.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft_float.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_float.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft_float.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_float.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft_init_table.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_init_table.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft_init_table.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_init_table.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fft_table.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_table.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fft_table.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fft_table.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ffv1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ffv1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ffv1.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ffv1.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ffv1dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ffv1dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ffv1enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ffv1enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffv1enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ffwavesynth.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffwavesynth.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ffwavesynth.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ffwavesynth.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/file_open.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/file_open.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/file_open.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/file_open.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flac_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flac_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flac_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flac_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacdata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacdata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacdsp_lpc_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp_lpc_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacdsp_lpc_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp_lpc_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacdsp_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacdsp_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacdsp_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flacenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flacenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flacenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flashsv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flashsv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flashsv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flashsv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flashsv2enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flashsv2enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flashsv2enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flashsv2enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flashsvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flashsvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flashsvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flashsvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flicvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flicvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flicvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flicvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flv.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flv.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flv.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flv.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/flvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/flvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/flvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fmtconvert.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fmtconvert.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fmtconvert.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fmtconvert.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fmtconvert.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fmtconvert.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fmtconvert.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fmtconvert.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/frame_thread_encoder.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/frame_thread_encoder.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/frame_thread_encoder.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/frame_thread_encoder.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/frame_thread_encoder.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/frame_thread_encoder.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/frame_thread_encoder.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/frame_thread_encoder.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/fraps.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fraps.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/fraps.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/fraps.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/frwu.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/frwu.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/frwu.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/frwu.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g2meet.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g2meet.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g2meet.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g2meet.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g722.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g722.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g722.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g722.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g722dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g722dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g722enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g722enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g722enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g723_1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g723_1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g723_1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g723_1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g723_1_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g723_1_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g723_1_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g723_1_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g726.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g726.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g726.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g726.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g729.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g729.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g729data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g729data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g729dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g729dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g729postfilter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729postfilter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g729postfilter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729postfilter.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/g729postfilter.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729postfilter.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/g729postfilter.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/g729postfilter.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/get_bits.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/get_bits.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/get_bits.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/get_bits.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gif.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gif.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gif.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gif.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gif.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gif.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gif.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gif.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gifdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gifdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gifdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gifdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/golomb-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/golomb-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/golomb-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/golomb-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/golomb.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/golomb.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/golomb.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/golomb.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/golomb.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/golomb.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/golomb.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/golomb.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gsm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gsm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gsm_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsm_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gsm_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsm_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gsmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gsmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gsmdec_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gsmdec_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gsmdec_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gsmdec_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/gsmdec_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/gsmdec_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/gsmdec_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h261.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h261.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h261.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h261.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h261_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h261_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h261data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h261data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h261dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h261dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h261enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h261enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h261enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h263.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h263.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h263.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h263.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h263_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h263_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h263_parser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263_parser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h263_parser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263_parser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h263data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h263data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h263dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h263dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h263dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_cabac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_cabac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_cabac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_cabac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_cavlc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_cavlc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_cavlc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_cavlc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_direct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_direct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_direct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_direct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_loopfilter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_loopfilter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_loopfilter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_loopfilter.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_mb_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mb_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_mb_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mb_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_mc_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mc_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_mc_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mc_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mp4toannexb_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_mp4toannexb_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mp4toannexb_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_mvpred.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mvpred.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_mvpred.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_mvpred.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_ps.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_ps.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_ps.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_ps.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_refs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_refs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_refs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_refs.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264_sei.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_sei.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264_sei.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264_sei.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264addpx_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264addpx_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264addpx_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264addpx_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264chroma.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264chroma.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264chroma.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264chroma.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264chroma.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264chroma.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264chroma.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264chroma.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264chroma_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264chroma_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264chroma_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264chroma_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264dsp_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264dsp_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264dsp_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264dsp_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264idct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264idct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264idct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264idct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264idct.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264idct.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264idct.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264idct.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264idct_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264idct_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264idct_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264idct_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264pred.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264pred.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264pred.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264pred.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264pred.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264pred.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264pred.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264pred.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264pred_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264pred_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264pred_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264pred_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264qpel.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264qpel.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264qpel.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264qpel.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264qpel.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264qpel.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264qpel.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264qpel.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/h264qpel_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264qpel_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/h264qpel_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/h264qpel_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc_cabac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_cabac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc_cabac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_cabac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc_filter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_filter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc_filter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_filter.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc_mvs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_mvs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc_mvs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_mvs.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc_ps.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_ps.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc_ps.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_ps.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc_refs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_refs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc_refs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_refs.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevc_sei.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_sei.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevc_sei.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevc_sei.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevcdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevcdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevcdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevcdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevcdsp_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcdsp_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevcdsp_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcdsp_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevcpred.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcpred.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevcpred.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcpred.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevcpred.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcpred.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevcpred.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcpred.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hevcpred_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcpred_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hevcpred_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hevcpred_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hpel_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpel_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hpel_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpel_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hpeldsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpeldsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hpeldsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpeldsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hpeldsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpeldsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hpeldsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpeldsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/hpeldsp_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpeldsp_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/hpeldsp_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/hpeldsp_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/huffman.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffman.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/huffman.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffman.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/huffman.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffman.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/huffman.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffman.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/huffyuv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/huffyuv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/huffyuv.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuv.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/huffyuv.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuv.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/huffyuvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/huffyuvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/huffyuvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/huffyuvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/huffyuvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/idcinvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/idcinvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/idcinvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/idcinvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/iff.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/iff.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/iff.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/iff.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/iirfilter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/iirfilter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/iirfilter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/iirfilter.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/iirfilter.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/iirfilter.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/iirfilter.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/iirfilter.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/imc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/imc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/imcdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imcdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/imcdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imcdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/imgconvert.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imgconvert.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/imgconvert.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imgconvert.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/imgconvert.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imgconvert.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/imgconvert.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imgconvert.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/imx_dump_header_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imx_dump_header_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/imx_dump_header_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/imx_dump_header_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo2data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo2data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo2data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo2data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo3.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo3data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo3data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo3data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo3data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo4.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo4data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo4data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo4data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo4data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo5.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo5.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo5.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo5.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/indeo5data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo5data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/indeo5data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/indeo5data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/intelh263dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intelh263dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/intelh263dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intelh263dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/interplayvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/interplayvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/interplayvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/interplayvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/intrax8.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/intrax8.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/intrax8.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/intrax8.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/intrax8dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/intrax8dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/intrax8dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/intrax8dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/intrax8huf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8huf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/intrax8huf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/intrax8huf.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ituh263dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ituh263dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ituh263dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ituh263dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ituh263enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ituh263enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ituh263enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ituh263enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ivi_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ivi_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ivi_common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ivi_common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_common.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ivi_dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ivi_dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ivi_dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ivi_dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ivi_dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/j2kenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/j2kenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/j2kenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/j2kenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jacosub.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jacosub.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jacosub.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jacosub.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jacosubdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jacosubdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jacosubdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jacosubdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jfdctfst.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jfdctfst.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jfdctfst.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jfdctfst.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jfdctint.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jfdctint.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jfdctint.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jfdctint.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jfdctint_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jfdctint_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jfdctint_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jfdctint_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000dwt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000dwt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000dwt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000dwt.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000dwt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000dwt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeg2000dwt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeg2000dwt.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpegls.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpegls.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpegls.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpegls.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpegls.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpegls.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpegls.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpegls.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeglsdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeglsdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeglsdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeglsdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeglsdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeglsdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeglsdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeglsdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jpeglsenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeglsenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jpeglsenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jpeglsenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jrevdct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jrevdct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jrevdct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jrevdct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/jvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/jvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/jvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/kbdwin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kbdwin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/kbdwin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kbdwin.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/kbdwin.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kbdwin.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/kbdwin.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kbdwin.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/kgv1dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kgv1dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/kgv1dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kgv1dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/kmvc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kmvc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/kmvc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/kmvc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lagarith.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lagarith.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lagarith.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lagarith.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lagarithrac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lagarithrac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lagarithrac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lagarithrac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lagarithrac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lagarithrac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lagarithrac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lagarithrac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/latm_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/latm_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/latm_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/latm_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lcl.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lcl.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lcl.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lcl.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lcldec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lcldec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lcldec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lcldec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lclenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lclenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lclenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lclenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libaacplus.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libaacplus.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libaacplus.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libaacplus.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libavcodec.pc b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libavcodec.pc similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libavcodec.pc rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libavcodec.pc diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libavcodec.v b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libavcodec.v similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libavcodec.v rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libavcodec.v diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libavcodec.ver b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libavcodec.ver similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libavcodec.ver rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libavcodec.ver diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libcelt_dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libcelt_dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libcelt_dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libcelt_dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libfaac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libfaac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libfaac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libfaac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libfdk-aacdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libfdk-aacdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libfdk-aacdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libfdk-aacdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libfdk-aacenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libfdk-aacenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libfdk-aacenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libfdk-aacenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libgsm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libgsm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libgsm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libgsm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libilbc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libilbc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libilbc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libilbc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libmp3lame.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libmp3lame.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libmp3lame.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libmp3lame.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libopencore-amr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopencore-amr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libopencore-amr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopencore-amr.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libopenjpegdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopenjpegdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libopenjpegdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopenjpegdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libopenjpegenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopenjpegenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libopenjpegenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopenjpegenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libopus.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopus.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libopus.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopus.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libopus.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopus.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libopus.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopus.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libopusdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopusdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libopusdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopusdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libopusenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopusenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libopusenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libopusenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libschroedinger.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedinger.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libschroedinger.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedinger.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libschroedinger.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedinger.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libschroedinger.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedinger.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libschroedingerdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedingerdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libschroedingerdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedingerdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libschroedingerenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedingerenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libschroedingerenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libschroedingerenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libshine.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libshine.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libshine.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libshine.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libspeexdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libspeexdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libspeexdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libspeexdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libspeexenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libspeexenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libspeexenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libspeexenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libstagefright.cpp b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libstagefright.cpp similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libstagefright.cpp rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libstagefright.cpp diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libtheoraenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libtheoraenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libtheoraenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libtheoraenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libtwolame.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libtwolame.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libtwolame.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libtwolame.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libutvideo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libutvideo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libutvideo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libutvideo.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libutvideodec.cpp b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libutvideodec.cpp similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libutvideodec.cpp rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libutvideodec.cpp diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libutvideoenc.cpp b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libutvideoenc.cpp similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libutvideoenc.cpp rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libutvideoenc.cpp diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libvo-aacenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvo-aacenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libvo-aacenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvo-aacenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libvo-amrwbenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvo-amrwbenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libvo-amrwbenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvo-amrwbenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libvorbisdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvorbisdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libvorbisdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvorbisdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libvorbisenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvorbisenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libvorbisenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvorbisenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libvpxdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvpxdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libvpxdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvpxdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libvpxenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvpxenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libvpxenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libvpxenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libwavpackenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libwavpackenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libwavpackenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libwavpackenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libx264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libx264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libx264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libx264.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libxavs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxavs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libxavs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxavs.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libxvid.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxvid.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libxvid.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxvid.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libxvid.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxvid.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libxvid.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxvid.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libxvid_rc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxvid_rc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libxvid_rc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libxvid_rc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/libzvbi-teletextdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libzvbi-teletextdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/libzvbi-teletextdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/libzvbi-teletextdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ljpegenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ljpegenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ljpegenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ljpegenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/loco.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/loco.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/loco.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/loco.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/log2_tab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/log2_tab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/log2_tab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/log2_tab.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lpc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lpc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lpc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lpc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lpc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lpc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lpc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lpc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lzw.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lzw.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lzw.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lzw.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lzw.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lzw.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lzw.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lzw.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/lzwenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lzwenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/lzwenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/lzwenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mace.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mace.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mace.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mace.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mathops.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mathops.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mathops.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mathops.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mathtables.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mathtables.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mathtables.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mathtables.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mdct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mdct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mdct_fixed.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct_fixed.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mdct_fixed.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct_fixed.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mdct_fixed_32.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct_fixed_32.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mdct_fixed_32.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct_fixed_32.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mdct_float.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct_float.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mdct_float.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdct_float.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/metasound.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/metasound.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/metasound.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/metasound.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/metasound_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/metasound_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/metasound_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/metasound_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/metasound_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/metasound_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/metasound_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/metasound_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/microdvddec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/microdvddec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/microdvddec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/microdvddec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mimic.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mimic.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mimic.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mimic.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/aaccoder_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aaccoder_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/aaccoder_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aaccoder_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/aacdec_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacdec_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/aacdec_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacdec_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/aacdec_mips.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacdec_mips.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/aacdec_mips.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacdec_mips.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/aacpsdsp_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacpsdsp_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/aacpsdsp_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacpsdsp_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/aacpsy_mips.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacpsy_mips.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/aacpsy_mips.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacpsy_mips.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/aacsbr_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacsbr_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/aacsbr_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacsbr_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/aacsbr_mips.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacsbr_mips.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/aacsbr_mips.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/aacsbr_mips.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/ac3dsp_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/ac3dsp_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/ac3dsp_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/ac3dsp_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/acelp_filters_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/acelp_filters_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/acelp_filters_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/acelp_filters_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/acelp_vectors_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/acelp_vectors_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/acelp_vectors_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/acelp_vectors_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/amrwbdec_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/amrwbdec_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/amrwbdec_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/amrwbdec_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/amrwbdec_mips.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/amrwbdec_mips.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/amrwbdec_mips.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/amrwbdec_mips.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/celp_filters_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/celp_filters_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/celp_filters_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/celp_filters_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/celp_math_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/celp_math_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/celp_math_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/celp_math_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/compute_antialias_fixed.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/compute_antialias_fixed.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/compute_antialias_fixed.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/compute_antialias_fixed.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/compute_antialias_float.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/compute_antialias_float.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/compute_antialias_float.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/compute_antialias_float.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/fft_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/fft_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/fft_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/fft_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/fmtconvert_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/fmtconvert_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/fmtconvert_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/fmtconvert_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/iirfilter_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/iirfilter_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/iirfilter_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/iirfilter_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/lsp_mips.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/lsp_mips.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/lsp_mips.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/lsp_mips.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/mathops.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/mathops.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/mathops.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/mathops.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/mpegaudiodsp_mips_fixed.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/mpegaudiodsp_mips_fixed.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/mpegaudiodsp_mips_fixed.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/mpegaudiodsp_mips_fixed.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/mpegaudiodsp_mips_float.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/mpegaudiodsp_mips_float.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/mpegaudiodsp_mips_float.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/mpegaudiodsp_mips_float.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mips/sbrdsp_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/sbrdsp_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mips/sbrdsp_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mips/sbrdsp_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpeg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpeg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpeg2jpeg_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg2jpeg_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpeg2jpeg_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg2jpeg_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpeg_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpeg_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpeg_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpega_dump_header_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpega_dump_header_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpega_dump_header_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpega_dump_header_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpegbdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegbdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpegbdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegbdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpegdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpegdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpegdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpegdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpegenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpegenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mjpegenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mjpegenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mjpegenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mlp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mlp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mlp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mlp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mlp_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mlp_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mlp_parser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp_parser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mlp_parser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlp_parser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mlpdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlpdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mlpdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlpdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mlpdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlpdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mlpdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlpdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mlpdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlpdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mlpdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mlpdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mmvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mmvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mmvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mmvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/motion-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motion-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/motion-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motion-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/motion_est.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motion_est.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/motion_est.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motion_est.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/motion_est_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motion_est_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/motion_est_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motion_est_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/motionpixels.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motionpixels.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/motionpixels.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motionpixels.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/motionpixels_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motionpixels_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/motionpixels_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motionpixels_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/motionpixels_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motionpixels_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/motionpixels_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/motionpixels_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/movsub_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/movsub_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/movsub_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/movsub_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/movtextdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/movtextdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/movtextdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/movtextdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/movtextenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/movtextenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/movtextenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/movtextenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mp3_header_compress_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mp3_header_compress_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mp3_header_compress_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mp3_header_compress_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mp3_header_decompress_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mp3_header_decompress_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mp3_header_decompress_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mp3_header_decompress_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpc7.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc7.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpc7.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc7.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpc7data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc7data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpc7data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc7data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpc8.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc8.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpc8.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc8.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpc8data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc8data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpc8data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc8data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpc8huff.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc8huff.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpc8huff.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpc8huff.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpcdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpcdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpcdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpcdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg12.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg12.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg12.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg12.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg12data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg12data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg12data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg12data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg12dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg12dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg12enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg12enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg12enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4audio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4audio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4audio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4audio.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4audio.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4audio.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4audio.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4audio.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video_parser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video_parser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4video_parser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4video_parser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4videodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4videodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4videodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4videodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpeg4videoenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4videoenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpeg4videoenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpeg4videoenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudio_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudio_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodec_float.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodec_float.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodec_float.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodec_float.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodecheader.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodecheader.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodecheader.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodecheader.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodecheader.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodecheader.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodecheader.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodecheader.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodectab.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodectab.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodectab.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodectab.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_fixed.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_fixed.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_fixed.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_fixed.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_float.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_float.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_float.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_float.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiodsp_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiodsp_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudioenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudioenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudioenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudioenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiotab.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiotab.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegaudiotab.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegaudiotab.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_motion.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_motion.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_motion.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_motion.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_xvmc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_xvmc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpegvideo_xvmc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpegvideo_xvmc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mpl2dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpl2dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mpl2dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mpl2dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mqc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mqc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mqc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mqc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mqcdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqcdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mqcdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqcdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mqcenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqcenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mqcenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mqcenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msgsmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msgsmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msgsmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msgsmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msgsmdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msgsmdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msgsmdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msgsmdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msmpeg4enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msmpeg4enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msrle.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msrle.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msrle.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msrle.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msrledec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msrledec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msrledec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msrledec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msrledec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msrledec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msrledec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msrledec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss12.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss12.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss12.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss12.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss12.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss12.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss12.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss12.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss2dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss2dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss2dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss2dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss2dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss2dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss2dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss2dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss3.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss34dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss34dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss34dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss34dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss34dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss34dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss34dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss34dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mss4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mss4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mss4.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msvideo1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msvideo1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msvideo1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msvideo1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/msvideo1enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msvideo1enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/msvideo1enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/msvideo1enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mvcdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mvcdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mvcdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mvcdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/mxpegdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mxpegdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/mxpegdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/mxpegdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/nellymoser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/nellymoser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/nellymoser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/nellymoser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/nellymoserdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoserdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/nellymoserdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoserdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/nellymoserenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoserenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/nellymoserenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nellymoserenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/noise_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/noise_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/noise_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/noise_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/nuv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nuv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/nuv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/nuv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/old_codec_ids.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/old_codec_ids.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/old_codec_ids.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/old_codec_ids.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/options.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/options.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/options.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/options.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/options_table.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/options_table.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/options_table.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/options_table.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/paf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/paf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/paf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/paf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/paf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/paf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/paf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/paf.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pamenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pamenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pamenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pamenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/parser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/parser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/parser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/parser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pcm-bluray.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm-bluray.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pcm-bluray.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm-bluray.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pcm-dvd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm-dvd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pcm-dvd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm-dvd.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pcm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pcm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pcm_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pcm_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pcm_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pcm_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcm_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pcx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pcx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pcxenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcxenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pcxenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pcxenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pgssubdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pgssubdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pgssubdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pgssubdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pictordec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pictordec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pictordec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pictordec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/png.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/png.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/png.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/png.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/png.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/png.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/png.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/png.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/png_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/png_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/png_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/png_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pngdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pngdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pngdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pngdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pngdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pngdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pngenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pngenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pngenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pnm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pnm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pnm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pnm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnm.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pnm_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnm_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pnm_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnm_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pnmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pnmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pnmenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnmenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pnmenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pnmenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/asm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/asm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/asm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/asm.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/dsputil_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/dsputil_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/dsputil_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/dsputil_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/dsputil_altivec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/dsputil_altivec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/dsputil_altivec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/dsputil_altivec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/dsputil_ppc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/dsputil_ppc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/dsputil_ppc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/dsputil_ppc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/fdct_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fdct_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/fdct_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fdct_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/fft_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fft_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/fft_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fft_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/fft_altivec_s.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fft_altivec_s.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/fft_altivec_s.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fft_altivec_s.S diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/fmtconvert_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fmtconvert_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/fmtconvert_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/fmtconvert_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/gmc_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/gmc_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/gmc_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/gmc_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264chroma_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264chroma_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264chroma_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264chroma_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264chroma_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264chroma_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264chroma_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264chroma_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264qpel.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264qpel.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264qpel.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264qpel.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264qpel_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264qpel_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/h264qpel_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/h264qpel_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/hpeldsp_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/hpeldsp_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/hpeldsp_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/hpeldsp_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/idct_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/idct_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/idct_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/idct_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/int_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/int_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/int_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/int_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/mathops.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/mathops.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/mathops.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/mathops.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/mpegaudiodsp_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/mpegaudiodsp_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/mpegaudiodsp_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/mpegaudiodsp_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/mpegvideo_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/mpegvideo_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/mpegvideo_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/mpegvideo_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vc1dsp_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/vc1dsp_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vc1dsp_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/videodsp_ppc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/videodsp_ppc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/videodsp_ppc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/videodsp_ppc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/vorbisdsp_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vorbisdsp_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/vorbisdsp_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vorbisdsp_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/vp3dsp_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vp3dsp_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/vp3dsp_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vp3dsp_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ppc/vp8dsp_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vp8dsp_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ppc/vp8dsp_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ppc/vp8dsp_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresdata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresdata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresdec2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdec2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresdec2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdec2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresdec_lgpl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdec_lgpl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresdec_lgpl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdec_lgpl.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresenc_anatoliy.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresenc_anatoliy.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresenc_anatoliy.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresenc_anatoliy.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/proresenc_kostya.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresenc_kostya.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/proresenc_kostya.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/proresenc_kostya.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/psymodel.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/psymodel.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/psymodel.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/psymodel.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/psymodel.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/psymodel.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/psymodel.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/psymodel.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/pthread.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pthread.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/pthread.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/pthread.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ptx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ptx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ptx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ptx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/put_bits.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/put_bits.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/put_bits.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/put_bits.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qcelpdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qcelpdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qcelpdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qcelpdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qcelpdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qcelpdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qcelpdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qcelpdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qdm2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qdm2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qdm2_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qdm2_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qdm2_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qdm2_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qdm2data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qdm2data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdm2data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qdrw.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdrw.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qdrw.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qdrw.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qtrle.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qtrle.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qtrle.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qtrle.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/qtrleenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qtrleenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/qtrleenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/qtrleenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/r210dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/r210dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/r210dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/r210dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/r210enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/r210enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/r210enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/r210enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ra144.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ra144.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ra144.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ra144.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ra144dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ra144dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ra144enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ra144enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra144enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ra288.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra288.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ra288.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra288.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ra288.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra288.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ra288.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ra288.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ralf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ralf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ralf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ralf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ralfdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ralfdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ralfdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ralfdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rangecoder.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rangecoder.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rangecoder.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rangecoder.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rangecoder.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rangecoder.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rangecoder.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rangecoder.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ratecontrol.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ratecontrol.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ratecontrol.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ratecontrol.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ratecontrol.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ratecontrol.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ratecontrol.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ratecontrol.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/raw.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/raw.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/raw.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/raw.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/raw.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/raw.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/raw.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/raw.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rawdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rawdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rawdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rawdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rawenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rawenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rawenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rawenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rdft.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rdft.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rdft.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rdft.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rdft.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rdft.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rdft.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rdft.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/realtextdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/realtextdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/realtextdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/realtextdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rectangle.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rectangle.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rectangle.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rectangle.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/remove_extradata_bsf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/remove_extradata_bsf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/remove_extradata_bsf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/remove_extradata_bsf.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/resample.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/resample.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/resample.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/resample.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/resample2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/resample2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/resample2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/resample2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rl.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rl.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rl.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rl.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rl2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rl2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rl2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rl2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rle.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rle.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rle.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rle.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rle.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rle.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rle.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rle.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rnd_avg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rnd_avg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rnd_avg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rnd_avg.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/roqaudioenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqaudioenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/roqaudioenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqaudioenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/roqvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/roqvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/roqvideo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/roqvideo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideo.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/roqvideodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/roqvideodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/roqvideoenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideoenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/roqvideoenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/roqvideoenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rpza.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rpza.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rpza.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rpza.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rtjpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rtjpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rtjpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rtjpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rtjpeg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rtjpeg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rtjpeg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rtjpeg.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv10.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv10.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv10.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv10.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv10enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv10enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv10enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv10enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv20enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv20enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv20enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv20enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv30.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv30.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv30.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv30.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv30data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv30data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv30data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv30data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv30dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv30dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv30dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv30dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv34.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv34.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv34.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv34.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv34_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv34_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv34data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv34data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv34dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv34dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv34dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv34dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv34vlc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34vlc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv34vlc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv34vlc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv40.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv40.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv40data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv40data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv40dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv40dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/rv40vlc2.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40vlc2.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/rv40vlc2.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/rv40vlc2.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/s302m.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s302m.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/s302m.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s302m.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/s302menc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s302menc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/s302menc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s302menc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/s3tc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s3tc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/s3tc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s3tc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/s3tc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s3tc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/s3tc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/s3tc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/samidec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/samidec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/samidec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/samidec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sanm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sanm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sanm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sanm.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sanm_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sanm_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sanm_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sanm_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sbr.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sbr.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sbr.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sbr.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sbrdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sbrdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sbrdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sbrdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sbrdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sbrdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sbrdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sbrdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sgi.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgi.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sgi.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgi.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sgidec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgidec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sgidec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgidec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sgienc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgienc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sgienc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgienc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sgirledec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgirledec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sgirledec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sgirledec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sh4/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sh4/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sh4/dsputil_sh4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/dsputil_sh4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sh4/dsputil_sh4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/dsputil_sh4.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sh4/dsputil_sh4.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/dsputil_sh4.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sh4/dsputil_sh4.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/dsputil_sh4.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sh4/idct_sh4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/idct_sh4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sh4/idct_sh4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/idct_sh4.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sh4/sh4.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/sh4.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sh4/sh4.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sh4/sh4.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/shorten.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/shorten.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/shorten.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/shorten.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/simple_idct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/simple_idct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/simple_idct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/simple_idct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/simple_idct.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/simple_idct.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/simple_idct.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/simple_idct.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/simple_idct_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/simple_idct_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/simple_idct_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/simple_idct_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sinewin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sinewin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sinewin.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sinewin.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sinewin_tablegen.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin_tablegen.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sinewin_tablegen.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin_tablegen.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sinewin_tablegen.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin_tablegen.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sinewin_tablegen.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sinewin_tablegen.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sipr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sipr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sipr.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sipr.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sipr16k.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr16k.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sipr16k.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr16k.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sipr16kdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr16kdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sipr16kdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sipr16kdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/siprdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/siprdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/siprdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/siprdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/smacker.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/smacker.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/smacker.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/smacker.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/smc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/smc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/smc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/smc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/smvjpegdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/smvjpegdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/smvjpegdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/smvjpegdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/snow.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/snow.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/snow.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/snow.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/snow_dwt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow_dwt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/snow_dwt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow_dwt.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/snow_dwt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow_dwt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/snow_dwt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snow_dwt.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/snowdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snowdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/snowdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snowdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/snowdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snowdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/snowdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snowdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/snowenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snowenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/snowenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/snowenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sonic.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sonic.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sonic.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sonic.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sp5x.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sp5x.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sp5x.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sp5x.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sp5xdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sp5xdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sp5xdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sp5xdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sparc/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sparc/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sparc/dsputil_vis.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/dsputil_vis.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sparc/dsputil_vis.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/dsputil_vis.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sparc/dsputil_vis.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/dsputil_vis.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sparc/dsputil_vis.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/dsputil_vis.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sparc/hpeldsp_vis.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/hpeldsp_vis.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sparc/hpeldsp_vis.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/hpeldsp_vis.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sparc/simple_idct_vis.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/simple_idct_vis.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sparc/simple_idct_vis.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/simple_idct_vis.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sparc/vis.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/vis.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sparc/vis.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sparc/vis.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/srtdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/srtdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/srtdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/srtdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/srtenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/srtenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/srtenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/srtenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/subviewerdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/subviewerdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/subviewerdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/subviewerdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sunrast.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sunrast.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sunrast.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sunrast.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sunrast.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sunrast.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sunrast.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sunrast.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/sunrastenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sunrastenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/sunrastenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/sunrastenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq1.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq1.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq13.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq13.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq13.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq13.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq1_cb.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1_cb.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq1_cb.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1_cb.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq1_vlc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1_vlc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq1_vlc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1_vlc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq1dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq1dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq1enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq1enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq1enc_cb.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1enc_cb.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq1enc_cb.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq1enc_cb.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq3.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/svq3.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq3.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/svq3.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/svq3.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/synth_filter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/synth_filter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/synth_filter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/synth_filter.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/synth_filter.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/synth_filter.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/synth_filter.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/synth_filter.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tableprint.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tableprint.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tableprint.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tableprint.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tak.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tak.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tak.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tak.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tak.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tak.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tak.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tak.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tak_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tak_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tak_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tak_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/takdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/takdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/takdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/takdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/targa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/targa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targa.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/targa.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targa.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/targa.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targa.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/targa_y216dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targa_y216dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/targa_y216dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targa_y216dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/targaenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targaenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/targaenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/targaenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/textdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/textdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/textdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/textdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/thread.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/thread.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/thread.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/thread.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiertexseqv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiertexseqv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiertexseqv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiertexseqv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiff.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiff.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiff.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiff.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiff_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiff_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiff_common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiff_common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_common.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiff_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiff_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiff_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiff_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiff_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tiffenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiffenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tiffenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tiffenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/timecode.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/timecode.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/timecode.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/timecode.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/timecode.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/timecode.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/timecode.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/timecode.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tmv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tmv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tmv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tmv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/truemotion1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truemotion1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/truemotion1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truemotion1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/truemotion1data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truemotion1data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/truemotion1data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truemotion1data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/truemotion2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truemotion2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/truemotion2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truemotion2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/truespeech.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truespeech.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/truespeech.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truespeech.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/truespeech_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truespeech_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/truespeech_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/truespeech_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tscc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tscc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tscc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tscc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tscc2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tscc2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tscc2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tscc2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tscc2data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tscc2data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tscc2data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tscc2data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/tta.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tta.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/tta.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/tta.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ttadata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ttadata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ttadata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ttadata.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ttadata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ttadata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ttadata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ttadata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ttaenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ttaenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ttaenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ttaenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/twinvq.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvq.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/twinvq.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvq.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/twinvq.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvq.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/twinvq.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvq.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/twinvq_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvq_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/twinvq_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvq_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/twinvqdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvqdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/twinvqdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/twinvqdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/txd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/txd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/txd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/txd.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ulti.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ulti.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ulti.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ulti.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ulti_cb.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ulti_cb.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ulti_cb.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ulti_cb.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/unary.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/unary.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/unary.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/unary.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/utils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/utils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utils.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/utvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/utvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/utvideo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/utvideo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideo.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/utvideodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/utvideodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/utvideoenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideoenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/utvideoenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/utvideoenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v210dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v210dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v210dec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210dec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v210dec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210dec.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v210enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v210enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v210x.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210x.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v210x.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v210x.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v308dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v308dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v308dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v308dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v308enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v308enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v308enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v308enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v408dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v408dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v408dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v408dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v408enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v408enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v408enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v408enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v410dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v410dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v410dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v410dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/v410enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v410enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/v410enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/v410enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi_h264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_h264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi_h264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_h264.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi_mpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_mpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi_mpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_mpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi_mpeg2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_mpeg2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi_mpeg2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_mpeg2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi_mpeg4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_mpeg4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi_mpeg4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_mpeg4.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vaapi_vc1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_vc1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vaapi_vc1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vaapi_vc1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vb.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vb.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vb.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vb.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vble.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vble.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vble.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vble.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1acdata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1acdata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1acdata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1acdata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vc1dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vc1dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vc1dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vcr1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vcr1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vcr1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vcr1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vda.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vda.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vda.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vda.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vda_h264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vda_h264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vda_h264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vda_h264.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vda_h264_dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vda_h264_dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vda_h264_dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vda_h264_dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vdpau.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vdpau.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vdpau.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vdpau.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vdpau_h264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_h264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vdpau_h264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_h264.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vdpau_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vdpau_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vdpau_mpeg12.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_mpeg12.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vdpau_mpeg12.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_mpeg12.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vdpau_mpeg4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_mpeg4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vdpau_mpeg4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_mpeg4.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vdpau_vc1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_vc1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vdpau_vc1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vdpau_vc1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/version.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/version.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/version.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/version.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/videodsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/videodsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/videodsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/videodsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/videodsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/videodsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/videodsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/videodsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/videodsp_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/videodsp_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/videodsp_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/videodsp_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vima.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vima.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vima.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vima.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vmdav.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vmdav.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vmdav.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vmdav.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vmnc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vmnc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vmnc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vmnc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbis.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbis.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbis.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbis.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbis_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbis_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbis_enc_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_enc_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbis_enc_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_enc_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbis_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbis_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbis_parser.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_parser.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbis_parser.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbis_parser.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbisdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbisdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbisdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbisdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbisdsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisdsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbisdsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisdsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vorbisenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vorbisenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vorbisenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp3_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp3_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp3data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp3data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp3dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp3dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp3dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp3dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp3dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp5.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp5.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp5.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp5.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp56.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp56.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp56.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp56.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp56data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp56data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56data.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp56data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp56data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp56dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp56dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp56dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp56dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp56rac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56rac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp56rac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp56rac.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp5data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp5data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp5data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp5data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp6.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp6.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp6.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp6.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp6data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp6data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp6data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp6data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp6dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp6dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp6dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp6dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp8.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp8.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp8.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp8.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp8_parser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8_parser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp8_parser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8_parser.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp8data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp8data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp8dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp8dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp8dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp8dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp8dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp9.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp9.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp9.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp9.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp9data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp9data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp9dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp9dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vp9dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vp9dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vp9dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/vqavideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vqavideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/vqavideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/vqavideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wavpack.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpack.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wavpack.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpack.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wavpack.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpack.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wavpack.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpack.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wavpackenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpackenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wavpackenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpackenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wavpackenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpackenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wavpackenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wavpackenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/webp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/webp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/webp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/webp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/webvttdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/webvttdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/webvttdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/webvttdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wma.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wma.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wma.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wma.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wma_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wma_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wma_common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma_common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wma_common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wma_common.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmadata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmadata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmadata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmadata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmadec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmadec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmadec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmadec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmaenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmaenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmaenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmaenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmalosslessdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmalosslessdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmalosslessdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmalosslessdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmaprodata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmaprodata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmaprodata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmaprodata.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmaprodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmaprodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmaprodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmaprodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmavoice.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmavoice.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmavoice.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmavoice.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmavoice_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmavoice_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmavoice_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmavoice_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmv2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmv2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmv2.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmv2.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmv2dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmv2dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmv2dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmv2dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmv2dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmv2dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wmv2enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wmv2enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wmv2enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/wnv1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wnv1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/wnv1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/wnv1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/ws-snd1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ws-snd1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/ws-snd1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/ws-snd1.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/ac3dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/ac3dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/ac3dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/ac3dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/ac3dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/ac3dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/ac3dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/ac3dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/cabac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/cabac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/cabac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/cabac.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/cavsdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/cavsdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/cavsdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/cavsdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/constants.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/constants.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/constants.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/constants.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/constants.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/constants.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/constants.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/constants.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dct32.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dct32.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dct32.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dct32.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dct_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dct_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dct_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dct_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/deinterlace.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/deinterlace.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/deinterlace.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/deinterlace.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dirac_dwt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dirac_dwt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dirac_dwt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dirac_dwt.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dirac_dwt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dirac_dwt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dirac_dwt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dirac_dwt.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/diracdsp_mmx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/diracdsp_mmx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/diracdsp_mmx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/diracdsp_mmx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/diracdsp_mmx.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/diracdsp_mmx.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/diracdsp_mmx.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/diracdsp_mmx.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/diracdsp_yasm.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/diracdsp_yasm.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/diracdsp_yasm.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/diracdsp_yasm.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dnxhdenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dnxhdenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dnxhdenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dnxhdenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_mmx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_mmx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_mmx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_mmx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_qns_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_qns_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_qns_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_qns_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_x86.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_x86.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_x86.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_x86.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_x86.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_x86.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputil_x86.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputil_x86.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputilenc.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputilenc.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputilenc.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputilenc.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputilenc_mmx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputilenc_mmx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dsputilenc_mmx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dsputilenc_mmx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/dwt_yasm.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dwt_yasm.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/dwt_yasm.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/dwt_yasm.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fdct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fdct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fdct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fdct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fft.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fft.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fft.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fft.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fft.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fft.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fft.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fft.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fft_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fft_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fft_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fft_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fmtconvert.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fmtconvert.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fmtconvert.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fmtconvert.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fmtconvert_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fmtconvert_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fmtconvert_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fmtconvert_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fpel.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fpel.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fpel.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fpel.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/fpel_mmx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fpel_mmx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/fpel_mmx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/fpel_mmx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h263_loopfilter.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h263_loopfilter.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h263_loopfilter.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h263_loopfilter.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_chromamc.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_chromamc.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_chromamc.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_chromamc.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_chromamc_10bit.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_chromamc_10bit.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_chromamc_10bit.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_chromamc_10bit.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_deblock.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_deblock.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_deblock.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_deblock.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_deblock_10bit.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_deblock_10bit.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_deblock_10bit.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_deblock_10bit.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_i386.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_i386.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_i386.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_i386.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_idct.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_idct.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_idct.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_idct.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_idct_10bit.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_idct_10bit.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_idct_10bit.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_idct_10bit.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_intrapred.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_intrapred.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_intrapred.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_intrapred.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_intrapred_10bit.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_intrapred_10bit.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_intrapred_10bit.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_intrapred_10bit.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_intrapred_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_intrapred_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_intrapred_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_intrapred_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_qpel.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_qpel.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_qpel.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_qpel.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_qpel_10bit.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_qpel_10bit.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_qpel_10bit.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_qpel_10bit.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_qpel_8bit.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_qpel_8bit.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_qpel_8bit.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_qpel_8bit.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_weight.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_weight.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_weight.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_weight.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_weight_10bit.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_weight_10bit.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264_weight_10bit.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264_weight_10bit.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264chroma_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264chroma_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264chroma_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264chroma_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/h264dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/h264dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/h264dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp_mmx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp_mmx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp_mmx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp_mmx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp_rnd_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp_rnd_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/hpeldsp_rnd_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/hpeldsp_rnd_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/idct_mmx_xvid.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/idct_mmx_xvid.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/idct_mmx_xvid.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/idct_mmx_xvid.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/idct_sse2_xvid.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/idct_sse2_xvid.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/idct_sse2_xvid.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/idct_sse2_xvid.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/idct_xvid.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/idct_xvid.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/idct_xvid.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/idct_xvid.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/imdct36.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/imdct36.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/imdct36.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/imdct36.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/lpc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/lpc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/lpc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/lpc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/mathops.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mathops.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/mathops.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mathops.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/mlpdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mlpdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/mlpdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mlpdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/motion_est.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/motion_est.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/motion_est.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/motion_est.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/mpeg4qpel.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpeg4qpel.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/mpeg4qpel.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpeg4qpel.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegaudiodsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegaudiodsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegaudiodsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegaudiodsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegvideo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegvideo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegvideo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegvideo.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegvideoenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegvideoenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegvideoenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegvideoenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegvideoenc_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegvideoenc_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/mpegvideoenc_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/mpegvideoenc_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/pngdsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/pngdsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/pngdsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/pngdsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/pngdsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/pngdsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/pngdsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/pngdsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/proresdsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/proresdsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/proresdsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/proresdsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/proresdsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/proresdsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/proresdsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/proresdsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/qpel.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/qpel.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/qpel.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/qpel.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/rnd_mmx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rnd_mmx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/rnd_mmx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rnd_mmx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/rnd_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rnd_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/rnd_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rnd_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/rv34dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv34dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/rv34dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv34dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/rv34dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv34dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/rv34dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv34dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/rv40dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv40dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/rv40dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv40dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/rv40dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv40dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/rv40dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/rv40dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/sbrdsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/sbrdsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/sbrdsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/sbrdsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/sbrdsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/sbrdsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/sbrdsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/sbrdsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/simple_idct.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/simple_idct.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/simple_idct.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/simple_idct.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/snowdsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/snowdsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/snowdsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/snowdsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/v210-init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/v210-init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/v210-init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/v210-init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/v210.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/v210.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/v210.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/v210.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp_mmx.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp_mmx.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vc1dsp_mmx.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vc1dsp_mmx.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/videodsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/videodsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/videodsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/videodsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/videodsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/videodsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/videodsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/videodsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vorbisdsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vorbisdsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vorbisdsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vorbisdsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vorbisdsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vorbisdsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vorbisdsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vorbisdsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp3dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp3dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp3dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp3dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp3dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp3dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp3dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp3dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp56_arith.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp56_arith.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp56_arith.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp56_arith.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp6dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp6dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp6dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp6dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp6dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp6dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp6dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp6dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp8dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp8dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp8dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp8dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp8dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp8dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp8dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp8dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp9dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp9dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp9dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp9dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/vp9dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp9dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/vp9dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/vp9dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/x86/w64xmmtest.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/w64xmmtest.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/x86/w64xmmtest.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/x86/w64xmmtest.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xan.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xan.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xan.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xan.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xbmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xbmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xbmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xbmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xbmenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xbmenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xbmenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xbmenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xface.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xface.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xface.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xface.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xface.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xface.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xface.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xface.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xfacedec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xfacedec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xfacedec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xfacedec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xfaceenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xfaceenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xfaceenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xfaceenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xiph.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xiph.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xiph.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xiph.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xiph.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xiph.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xiph.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xiph.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xl.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xsubdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xsubdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xsubdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xsubdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xsubenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xsubenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xsubenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xsubenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xvmc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xvmc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xvmc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xvmc.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xvmc_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xvmc_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xvmc_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xvmc_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xwd.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xwd.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xwd.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xwd.h diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xwddec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xwddec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xwddec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xwddec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xwdenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xwdenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xwdenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xwdenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/xxan.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xxan.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/xxan.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/xxan.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/y41pdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/y41pdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/y41pdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/y41pdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/y41penc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/y41penc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/y41penc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/y41penc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/yop.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/yop.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/yop.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/yop.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/yuv4dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/yuv4dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/yuv4dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/yuv4dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/yuv4enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/yuv4enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/yuv4enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/yuv4enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/zerocodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/zerocodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/zerocodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/zerocodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/zmbv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/zmbv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/zmbv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/zmbv.c diff --git a/contrib/sdk/sources/ffmpeg/libavcodec/zmbvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/zmbvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavcodec/zmbvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavcodec/zmbvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/alldevices.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alldevices.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/alldevices.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alldevices.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio-common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio-common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio-common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio-common.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio-dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio-dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio-dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio-dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio-enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio-enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio-enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio-enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/alsa-audio.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/alsa-audio.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/avdevice-55.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice-55.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/avdevice-55.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice-55.def diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/avdevice-55.orig.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice-55.orig.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/avdevice-55.orig.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice-55.orig.def diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/avdevice.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/avdevice.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/avdevice.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/avdevice.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/avdevice.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/bktr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/bktr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/bktr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/bktr.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/caca.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/caca.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/caca.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/caca.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dshow.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dshow.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dshow_capture.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_capture.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dshow_capture.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_capture.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dshow_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dshow_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dshow_enummediatypes.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_enummediatypes.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dshow_enummediatypes.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_enummediatypes.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dshow_enumpins.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_enumpins.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dshow_enumpins.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_enumpins.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dshow_filter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_filter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dshow_filter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_filter.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dshow_pin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_pin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dshow_pin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dshow_pin.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dv1394.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dv1394.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dv1394.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dv1394.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/dv1394.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dv1394.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/dv1394.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/dv1394.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/fbdev_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/fbdev_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/fbdev_common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/fbdev_common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_common.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/fbdev_dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/fbdev_dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/fbdev_enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/fbdev_enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/fbdev_enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/file_open.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/file_open.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/file_open.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/file_open.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/iec61883.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/iec61883.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/iec61883.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/iec61883.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/jack_audio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/jack_audio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/jack_audio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/jack_audio.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/lavfi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/lavfi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/lavfi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/lavfi.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/libavdevice.pc b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libavdevice.pc similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/libavdevice.pc rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libavdevice.pc diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/libavdevice.v b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libavdevice.v similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/libavdevice.v rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libavdevice.v diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/libavdevice.ver b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libavdevice.ver similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/libavdevice.ver rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libavdevice.ver diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/libcdio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libcdio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/libcdio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libcdio.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/libdc1394.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libdc1394.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/libdc1394.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/libdc1394.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/openal-dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/openal-dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/openal-dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/openal-dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/oss_audio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/oss_audio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/oss_audio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/oss_audio.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_common.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/pulse_audio_enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/pulse_audio_enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/sdl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sdl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/sdl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sdl.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/sndio_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/sndio_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/sndio_common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/sndio_common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_common.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/sndio_dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/sndio_dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/sndio_enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/sndio_enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/sndio_enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/timefilter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/timefilter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/timefilter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/timefilter.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/timefilter.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/timefilter.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/timefilter.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/timefilter.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/v4l.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/v4l.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/v4l2-common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2-common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/v4l2-common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2-common.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/v4l2-common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2-common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/v4l2-common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2-common.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/v4l2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/v4l2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/v4l2enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/v4l2enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/v4l2enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/version.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/version.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/version.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/version.h diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/vfwcap.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/vfwcap.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/vfwcap.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/vfwcap.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/x11grab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/x11grab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/x11grab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/x11grab.c diff --git a/contrib/sdk/sources/ffmpeg/libavdevice/xv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/xv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavdevice/xv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavdevice/xv.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_aconvert.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aconvert.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_aconvert.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aconvert.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_adelay.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_adelay.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_adelay.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_adelay.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_aecho.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aecho.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_aecho.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aecho.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_afade.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_afade.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_afade.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_afade.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_aformat.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aformat.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_aformat.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aformat.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_amerge.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_amerge.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_amerge.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_amerge.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_amix.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_amix.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_amix.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_amix.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_anull.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_anull.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_anull.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_anull.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_apad.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_apad.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_apad.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_apad.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_aphaser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aphaser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_aphaser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aphaser.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_aresample.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aresample.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_aresample.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_aresample.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_asetnsamples.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_asetnsamples.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_asetnsamples.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_asetnsamples.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_asetrate.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_asetrate.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_asetrate.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_asetrate.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_ashowinfo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_ashowinfo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_ashowinfo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_ashowinfo.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_astats.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_astats.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_astats.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_astats.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_astreamsync.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_astreamsync.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_astreamsync.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_astreamsync.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_asyncts.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_asyncts.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_asyncts.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_asyncts.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_atempo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_atempo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_atempo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_atempo.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_biquads.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_biquads.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_biquads.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_biquads.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_channelmap.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_channelmap.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_channelmap.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_channelmap.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_channelsplit.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_channelsplit.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_channelsplit.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_channelsplit.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_compand.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_compand.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_compand.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_compand.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_earwax.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_earwax.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_earwax.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_earwax.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_join.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_join.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_join.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_join.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_ladspa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_ladspa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_ladspa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_ladspa.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_pan.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_pan.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_pan.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_pan.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_replaygain.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_replaygain.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_replaygain.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_replaygain.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_resample.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_resample.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_resample.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_resample.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_silencedetect.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_silencedetect.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_silencedetect.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_silencedetect.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_volume.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_volume.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_volume.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_volume.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_volume.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_volume.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_volume.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_volume.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/af_volumedetect.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_volumedetect.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/af_volumedetect.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/af_volumedetect.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/all_channel_layouts.inc b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/all_channel_layouts.inc similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/all_channel_layouts.inc rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/all_channel_layouts.inc diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/allfilters.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/allfilters.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/allfilters.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/allfilters.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/asink_anullsink.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asink_anullsink.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/asink_anullsink.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asink_anullsink.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/asrc_abuffer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_abuffer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/asrc_abuffer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_abuffer.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/asrc_aevalsrc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_aevalsrc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/asrc_aevalsrc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_aevalsrc.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/asrc_anullsrc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_anullsrc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/asrc_anullsrc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_anullsrc.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/asrc_flite.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_flite.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/asrc_flite.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_flite.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/asrc_sine.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_sine.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/asrc_sine.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/asrc_sine.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/audio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/audio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/audio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/audio.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/audio.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/audio.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/audio.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/audio.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avcodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avcodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avcodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avcodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avcodec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avcodec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avcodec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avcodec.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avf_avectorscope.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_avectorscope.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avf_avectorscope.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_avectorscope.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avf_concat.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_concat.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avf_concat.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_concat.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avf_showspectrum.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_showspectrum.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avf_showspectrum.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_showspectrum.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avf_showwaves.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_showwaves.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avf_showwaves.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avf_showwaves.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avfilter.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfilter.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avfilter.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfilter.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avfilter.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfilter.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avfilter.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfilter.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avfiltergraph.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfiltergraph.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avfiltergraph.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfiltergraph.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/avfiltergraph.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfiltergraph.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/avfiltergraph.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/avfiltergraph.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/bbox.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/bbox.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/bbox.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/bbox.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/bbox.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/bbox.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/bbox.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/bbox.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/buffer.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffer.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/buffer.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffer.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/bufferqueue.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/bufferqueue.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/bufferqueue.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/bufferqueue.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/buffersink.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersink.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/buffersink.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersink.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/buffersink.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersink.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/buffersink.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersink.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/buffersrc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersrc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/buffersrc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersrc.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/buffersrc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersrc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/buffersrc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/buffersrc.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/deshake.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/deshake.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/deshake_opencl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake_opencl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/deshake_opencl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake_opencl.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/deshake_opencl.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake_opencl.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/deshake_opencl.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake_opencl.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/deshake_opencl_kernel.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake_opencl_kernel.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/deshake_opencl_kernel.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/deshake_opencl_kernel.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/drawutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/drawutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/drawutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/drawutils.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/drawutils.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/drawutils.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/drawutils.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/drawutils.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/dualinput.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/dualinput.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/dualinput.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/dualinput.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/dualinput.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/dualinput.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/dualinput.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/dualinput.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/f_ebur128.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_ebur128.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/f_ebur128.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_ebur128.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/f_interleave.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_interleave.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/f_interleave.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_interleave.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/f_perms.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_perms.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/f_perms.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_perms.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/f_select.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_select.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/f_select.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_select.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/f_sendcmd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_sendcmd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/f_sendcmd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_sendcmd.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/f_settb.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_settb.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/f_settb.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_settb.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/f_zmq.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_zmq.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/f_zmq.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/f_zmq.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/fifo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/fifo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/fifo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/fifo.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/filtfmts.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/filtfmts.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/filtfmts.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/filtfmts.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/formats.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/formats.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/formats.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/formats.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/formats.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/formats.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/formats.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/formats.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/framesync.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/framesync.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/framesync.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/framesync.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/framesync.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/framesync.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/framesync.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/framesync.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/gradfun.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/gradfun.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/gradfun.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/gradfun.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/graphdump.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/graphdump.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/graphdump.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/graphdump.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/graphparser.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/graphparser.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/graphparser.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/graphparser.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/lavfutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lavfutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/lavfutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lavfutils.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/lavfutils.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lavfutils.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/lavfutils.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lavfutils.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libavfilter.v b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libavfilter.v similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libavfilter.v rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libavfilter.v diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/av_helpers.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/av_helpers.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/av_helpers.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/av_helpers.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/cpudetect.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/cpudetect.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/cpudetect.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/cpudetect.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/img_format.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/img_format.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/img_format.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/img_format.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/img_format.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/img_format.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/img_format.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/img_format.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/libvo/fastmemcpy.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/libvo/fastmemcpy.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/libvo/fastmemcpy.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/libvo/fastmemcpy.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/libvo/video_out.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/libvo/video_out.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/libvo/video_out.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/libvo/video_out.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mp_image.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mp_image.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mp_image.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mp_image.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mp_image.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mp_image.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mp_image.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mp_image.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mp_msg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mp_msg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mp_msg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mp_msg.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mpc_info.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mpc_info.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/mpc_info.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/mpc_info.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_eq.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_eq.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_eq.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_eq.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_eq2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_eq2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_eq2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_eq2.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_fspp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_fspp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_fspp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_fspp.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_ilpack.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_ilpack.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_ilpack.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_ilpack.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_pp7.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_pp7.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_pp7.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_pp7.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_softpulldown.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_softpulldown.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_softpulldown.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_softpulldown.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_uspp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_uspp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vf_uspp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vf_uspp.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vfcap.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vfcap.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/libmpcodecs/vfcap.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/libmpcodecs/vfcap.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/lswsutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lswsutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/lswsutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lswsutils.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/lswsutils.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lswsutils.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/lswsutils.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/lswsutils.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/opencl_allkernels.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/opencl_allkernels.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/opencl_allkernels.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/opencl_allkernels.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/opencl_allkernels.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/opencl_allkernels.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/opencl_allkernels.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/opencl_allkernels.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/pthread.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/pthread.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/pthread.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/pthread.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/setpts.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/setpts.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/setpts.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/setpts.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/split.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/split.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/split.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/split.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/src_movie.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/src_movie.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/src_movie.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/src_movie.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/thread.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/thread.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/thread.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/thread.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/transform.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/transform.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/transform.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/transform.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/transform.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/transform.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/transform.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/transform.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/trim.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/trim.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/trim.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/trim.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/unsharp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/unsharp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/unsharp_opencl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp_opencl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/unsharp_opencl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp_opencl.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/unsharp_opencl.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp_opencl.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/unsharp_opencl.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp_opencl.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/unsharp_opencl_kernel.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp_opencl_kernel.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/unsharp_opencl_kernel.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/unsharp_opencl_kernel.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/version.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/version.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/version.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/version.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_alphamerge.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_alphamerge.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_alphamerge.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_alphamerge.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_aspect.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_aspect.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_aspect.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_aspect.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_bbox.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_bbox.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_bbox.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_bbox.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_blackdetect.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_blackdetect.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_blackdetect.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_blackdetect.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_blackframe.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_blackframe.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_blackframe.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_blackframe.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_blend.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_blend.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_blend.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_blend.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_boxblur.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_boxblur.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_boxblur.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_boxblur.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_colorbalance.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_colorbalance.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_colorbalance.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_colorbalance.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_colorchannelmixer.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_colorchannelmixer.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_colorchannelmixer.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_colorchannelmixer.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_colormatrix.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_colormatrix.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_colormatrix.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_colormatrix.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_copy.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_copy.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_copy.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_copy.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_crop.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_crop.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_crop.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_crop.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_cropdetect.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_cropdetect.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_cropdetect.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_cropdetect.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_curves.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_curves.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_curves.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_curves.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_dctdnoiz.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_dctdnoiz.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_dctdnoiz.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_dctdnoiz.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_decimate.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_decimate.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_decimate.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_decimate.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_delogo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_delogo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_delogo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_delogo.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_deshake.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_deshake.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_deshake.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_deshake.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_drawbox.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_drawbox.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_drawbox.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_drawbox.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_drawtext.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_drawtext.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_drawtext.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_drawtext.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_edgedetect.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_edgedetect.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_edgedetect.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_edgedetect.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_extractplanes.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_extractplanes.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_extractplanes.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_extractplanes.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_fade.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fade.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_fade.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fade.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_field.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_field.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_field.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_field.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_fieldmatch.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fieldmatch.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_fieldmatch.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fieldmatch.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_fieldorder.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fieldorder.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_fieldorder.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fieldorder.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_format.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_format.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_format.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_format.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_fps.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fps.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_fps.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_fps.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_framestep.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_framestep.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_framestep.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_framestep.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_frei0r.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_frei0r.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_frei0r.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_frei0r.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_geq.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_geq.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_geq.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_geq.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_gradfun.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_gradfun.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_gradfun.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_gradfun.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_hflip.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hflip.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_hflip.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hflip.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_histeq.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_histeq.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_histeq.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_histeq.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_histogram.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_histogram.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_histogram.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_histogram.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_hqdn3d.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hqdn3d.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_hqdn3d.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hqdn3d.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_hqdn3d.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hqdn3d.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_hqdn3d.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hqdn3d.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_hue.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hue.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_hue.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_hue.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_idet.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_idet.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_idet.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_idet.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_il.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_il.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_il.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_il.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_interlace.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_interlace.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_interlace.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_interlace.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_kerndeint.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_kerndeint.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_kerndeint.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_kerndeint.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_libopencv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_libopencv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_libopencv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_libopencv.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_lut.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_lut.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_lut.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_lut.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_lut3d.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_lut3d.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_lut3d.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_lut3d.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_mcdeint.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mcdeint.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_mcdeint.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mcdeint.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_mergeplanes.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mergeplanes.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_mergeplanes.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mergeplanes.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_mp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_mp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mp.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_mpdecimate.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mpdecimate.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_mpdecimate.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_mpdecimate.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_noise.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_noise.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_noise.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_noise.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_null.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_null.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_null.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_null.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_overlay.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_overlay.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_overlay.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_overlay.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_owdenoise.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_owdenoise.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_owdenoise.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_owdenoise.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_pad.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pad.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_pad.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pad.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_perspective.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_perspective.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_perspective.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_perspective.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_phase.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_phase.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_phase.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_phase.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_pixdesctest.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pixdesctest.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_pixdesctest.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pixdesctest.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_pp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_pp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pp.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_psnr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_psnr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_psnr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_psnr.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_pullup.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pullup.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_pullup.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pullup.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_pullup.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pullup.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_pullup.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_pullup.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_removelogo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_removelogo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_removelogo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_removelogo.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_rotate.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_rotate.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_rotate.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_rotate.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_sab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_sab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_sab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_sab.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_scale.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_scale.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_scale.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_scale.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_separatefields.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_separatefields.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_separatefields.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_separatefields.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_setfield.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_setfield.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_setfield.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_setfield.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_showinfo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_showinfo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_showinfo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_showinfo.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_smartblur.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_smartblur.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_smartblur.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_smartblur.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_spp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_spp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_spp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_spp.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_spp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_spp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_spp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_spp.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_stereo3d.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_stereo3d.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_stereo3d.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_stereo3d.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_subtitles.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_subtitles.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_subtitles.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_subtitles.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_super2xsai.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_super2xsai.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_super2xsai.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_super2xsai.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_swapuv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_swapuv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_swapuv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_swapuv.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_telecine.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_telecine.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_telecine.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_telecine.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_thumbnail.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_thumbnail.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_thumbnail.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_thumbnail.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_tile.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_tile.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_tile.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_tile.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_tinterlace.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_tinterlace.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_tinterlace.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_tinterlace.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_transpose.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_transpose.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_transpose.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_transpose.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_unsharp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_unsharp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_unsharp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_unsharp.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_vflip.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vflip.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_vflip.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vflip.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_vidstabdetect.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vidstabdetect.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_vidstabdetect.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vidstabdetect.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_vidstabtransform.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vidstabtransform.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_vidstabtransform.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vidstabtransform.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_vignette.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vignette.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_vignette.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_vignette.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_w3fdif.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_w3fdif.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_w3fdif.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_w3fdif.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vf_yadif.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_yadif.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vf_yadif.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vf_yadif.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/video.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/video.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/video.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/video.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/video.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/video.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/video.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/video.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vidstabutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vidstabutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vidstabutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vidstabutils.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vidstabutils.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vidstabutils.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vidstabutils.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vidstabutils.h diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vsink_nullsink.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsink_nullsink.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vsink_nullsink.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsink_nullsink.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vsrc_cellauto.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_cellauto.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vsrc_cellauto.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_cellauto.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vsrc_life.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_life.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vsrc_life.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_life.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vsrc_mandelbrot.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_mandelbrot.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vsrc_mandelbrot.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_mandelbrot.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vsrc_mptestsrc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_mptestsrc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vsrc_mptestsrc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_mptestsrc.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/vsrc_testsrc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_testsrc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/vsrc_testsrc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/vsrc_testsrc.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/af_volume.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/af_volume.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/af_volume.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/af_volume.asm diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/af_volume_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/af_volume_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/af_volume_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/af_volume_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_gradfun.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_gradfun.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_gradfun.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_gradfun.asm diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_gradfun_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_gradfun_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_gradfun_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_gradfun_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_hqdn3d.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_hqdn3d.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_hqdn3d.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_hqdn3d.asm diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_hqdn3d_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_hqdn3d_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_hqdn3d_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_hqdn3d_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_pullup.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_pullup.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_pullup.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_pullup.asm diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_pullup_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_pullup_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_pullup_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_pullup_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_spp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_spp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_spp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_spp.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_yadif.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_yadif.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_yadif.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_yadif.asm diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_yadif_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_yadif_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/vf_yadif_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/vf_yadif_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/yadif-10.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/yadif-10.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/yadif-10.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/yadif-10.asm diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/x86/yadif-16.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/yadif-16.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/x86/yadif-16.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/x86/yadif-16.asm diff --git a/contrib/sdk/sources/ffmpeg/libavfilter/yadif.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/yadif.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavfilter/yadif.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavfilter/yadif.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/4xm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/4xm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/4xm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/4xm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavformat/a64.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/a64.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/a64.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/a64.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/aacdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aacdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/aacdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aacdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ac3dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ac3dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ac3dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ac3dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/act.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/act.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/act.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/act.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/adp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/adp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/adp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/adp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/adtsenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/adtsenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/adtsenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/adtsenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/adxdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/adxdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/adxdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/adxdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/aea.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aea.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/aea.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aea.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/afc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/afc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/afc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/afc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/aiff.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aiff.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/aiff.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aiff.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/aiffdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aiffdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/aiffdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aiffdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/aiffenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aiffenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/aiffenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aiffenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/allformats.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/allformats.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/allformats.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/allformats.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/amr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/amr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/amr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/amr.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/anm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/anm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/anm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/anm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/apc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/apc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/apc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/apc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ape.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ape.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ape.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ape.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/apetag.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/apetag.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/apetag.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/apetag.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/apetag.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/apetag.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/apetag.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/apetag.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/aqtitledec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aqtitledec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/aqtitledec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aqtitledec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/asf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/asf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/asf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/asf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asf.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/asfcrypt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfcrypt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/asfcrypt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfcrypt.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/asfcrypt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfcrypt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/asfcrypt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfcrypt.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/asfdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/asfdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/asfenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/asfenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/asfenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/assdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/assdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/assdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/assdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/assenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/assenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/assenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/assenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ast.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ast.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ast.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ast.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ast.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ast.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ast.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ast.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/astdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/astdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/astdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/astdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/astenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/astenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/astenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/astenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/au.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/au.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/au.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/au.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/audiointerleave.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/audiointerleave.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/audiointerleave.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/audiointerleave.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/audiointerleave.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/audiointerleave.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/audiointerleave.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/audiointerleave.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avc.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avformat-55.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avformat-55.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avformat-55.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avformat-55.def diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avformat-55.orig.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avformat-55.orig.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avformat-55.orig.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avformat-55.orig.def diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avformat.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avformat.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avformat.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avformat.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avi.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avi.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avi.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avi.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avidec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avidec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avidec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avidec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avienc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avienc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avienc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avienc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avio.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avio.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avio.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avio.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avio.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avio.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avio.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avio.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avio_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avio_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avio_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avio_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/aviobuf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aviobuf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/aviobuf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/aviobuf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avisynth.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avisynth.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avisynth.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avisynth.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avlanguage.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avlanguage.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avlanguage.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avlanguage.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avlanguage.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avlanguage.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avlanguage.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avlanguage.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avr.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/avs.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avs.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/avs.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/avs.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/bethsoftvid.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bethsoftvid.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/bethsoftvid.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bethsoftvid.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/bfi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bfi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/bfi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bfi.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/bink.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bink.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/bink.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bink.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/bintext.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bintext.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/bintext.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bintext.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/bit.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bit.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/bit.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bit.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/bluray.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bluray.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/bluray.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bluray.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/bmv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bmv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/bmv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/bmv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/boadec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/boadec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/boadec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/boadec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/brstm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/brstm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/brstm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/brstm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/c93.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/c93.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/c93.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/c93.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/cache.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cache.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/cache.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cache.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/caf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/caf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/caf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/caf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/caf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/caf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/caf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/caf.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/cafdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cafdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/cafdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cafdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/cafenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cafenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/cafenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cafenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/cavsvideodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cavsvideodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/cavsvideodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cavsvideodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/cdg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cdg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/cdg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cdg.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/cdxl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cdxl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/cdxl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cdxl.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/concat.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/concat.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/concat.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/concat.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/concatdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/concatdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/concatdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/concatdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/crcenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/crcenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/crcenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/crcenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/crypto.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/crypto.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/crypto.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/crypto.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/cutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/cutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/cutils.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/data_uri.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/data_uri.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/data_uri.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/data_uri.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/daud.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/daud.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/daud.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/daud.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dfa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dfa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dfa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dfa.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/diracdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/diracdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/diracdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/diracdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dnxhddec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dnxhddec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dnxhddec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dnxhddec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dsicin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dsicin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dsicin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dsicin.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dtsdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dtsdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dtsdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dtsdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dtshddec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dtshddec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dtshddec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dtshddec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dv.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dv.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dv.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dv.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/dxa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dxa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/dxa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/dxa.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/eacdata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/eacdata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/eacdata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/eacdata.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/electronicarts.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/electronicarts.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/electronicarts.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/electronicarts.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/epafdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/epafdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/epafdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/epafdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ffm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ffm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffm.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ffmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ffmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ffmenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ffmenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ffmeta.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmeta.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ffmeta.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmeta.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ffmetadec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmetadec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ffmetadec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmetadec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ffmetaenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmetaenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ffmetaenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ffmetaenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/file.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/file.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/file.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/file.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/file_open.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/file_open.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/file_open.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/file_open.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/filmstripdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/filmstripdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/filmstripdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/filmstripdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/filmstripenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/filmstripenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/filmstripenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/filmstripenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flac_picture.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flac_picture.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flac_picture.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flac_picture.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flac_picture.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flac_picture.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flac_picture.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flac_picture.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flacdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flacdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flacenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flacenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flacenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flacenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flacenc_header.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacenc_header.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flacenc_header.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flacenc_header.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flic.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flic.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flic.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flic.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flv.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flv.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flv.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flv.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/flvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/flvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/flvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/format.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/format.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/format.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/format.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/framecrcenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/framecrcenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/framecrcenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/framecrcenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/framehash.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/framehash.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/framehash.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/framehash.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/frmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/frmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/frmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/frmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ftp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ftp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ftp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ftp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/g722.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/g722.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/g722.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/g722.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/g723_1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/g723_1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/g723_1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/g723_1.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/g729dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/g729dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/g729dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/g729dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/gif.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gif.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/gif.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gif.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/gifdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gifdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/gifdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gifdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/gopher.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gopher.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/gopher.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gopher.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/gsmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gsmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/gsmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gsmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/gxf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gxf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/gxf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gxf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/gxf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gxf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/gxf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gxf.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/gxfenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gxfenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/gxfenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/gxfenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/h261dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/h261dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/h261dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/h261dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/h263dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/h263dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/h263dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/h263dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/h264dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/h264dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/h264dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/h264dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/hevcdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hevcdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/hevcdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hevcdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/hls.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hls.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/hls.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hls.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/hlsenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hlsenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/hlsenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hlsenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/hlsproto.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hlsproto.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/hlsproto.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/hlsproto.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/http.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/http.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/http.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/http.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/http.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/http.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/http.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/http.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/httpauth.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/httpauth.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/httpauth.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/httpauth.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/httpauth.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/httpauth.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/httpauth.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/httpauth.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/icodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/icodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/icodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/icodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/icoenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/icoenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/icoenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/icoenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/id3v1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/id3v1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v1.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/id3v1.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v1.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/id3v1.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v1.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/id3v2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/id3v2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v2.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/id3v2.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v2.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/id3v2.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v2.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/id3v2enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v2enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/id3v2enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/id3v2enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/idcin.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/idcin.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/idcin.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/idcin.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/idroqdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/idroqdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/idroqdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/idroqdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/idroqenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/idroqenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/idroqenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/idroqenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/iff.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/iff.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/iff.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/iff.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ilbc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ilbc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ilbc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ilbc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/img2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/img2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/img2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/img2.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/img2dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/img2dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/img2dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/img2dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/img2enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/img2enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/img2enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/img2enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ingenientdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ingenientdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ingenientdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ingenientdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ipmovie.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ipmovie.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ipmovie.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ipmovie.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ircam.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircam.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ircam.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircam.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ircam.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircam.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ircam.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircam.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ircamdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircamdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ircamdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircamdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ircamenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircamenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ircamenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ircamenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/isom.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/isom.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/isom.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/isom.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/isom.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/isom.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/isom.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/isom.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/iss.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/iss.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/iss.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/iss.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/iv8.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/iv8.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/iv8.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/iv8.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ivfdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ivfdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ivfdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ivfdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ivfenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ivfenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ivfenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ivfenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/jacosubdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/jacosubdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/jacosubdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/jacosubdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/jacosubenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/jacosubenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/jacosubenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/jacosubenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/jvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/jvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/jvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/jvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/latmenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/latmenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/latmenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/latmenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libavformat.pc b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libavformat.pc similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libavformat.pc rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libavformat.pc diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libavformat.v b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libavformat.v similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libavformat.v rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libavformat.v diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libavformat.ver b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libavformat.ver similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libavformat.ver rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libavformat.ver diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libgme.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libgme.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libgme.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libgme.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libmodplug.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libmodplug.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libmodplug.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libmodplug.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libnut.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libnut.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libnut.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libnut.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libquvi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libquvi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libquvi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libquvi.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/librtmp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/librtmp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/librtmp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/librtmp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/libssh.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libssh.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/libssh.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/libssh.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/lmlm4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/lmlm4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/lmlm4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/lmlm4.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/loasdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/loasdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/loasdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/loasdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/log2_tab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/log2_tab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/log2_tab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/log2_tab.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/lvfdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/lvfdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/lvfdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/lvfdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/lxfdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/lxfdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/lxfdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/lxfdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/m4vdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/m4vdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/m4vdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/m4vdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/matroska.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroska.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/matroska.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroska.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/matroska.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroska.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/matroska.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroska.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/matroskadec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroskadec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/matroskadec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroskadec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/matroskaenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroskaenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/matroskaenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/matroskaenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/md5enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/md5enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/md5enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/md5enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/md5proto.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/md5proto.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/md5proto.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/md5proto.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/metadata.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/metadata.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/metadata.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/metadata.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/metadata.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/metadata.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/metadata.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/metadata.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mgsts.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mgsts.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mgsts.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mgsts.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/microdvddec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/microdvddec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/microdvddec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/microdvddec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/microdvdenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/microdvdenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/microdvdenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/microdvdenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mkvtimestamp_v2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mkvtimestamp_v2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mkvtimestamp_v2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mkvtimestamp_v2.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mmf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mmf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mmf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mmf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mms.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mms.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mms.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mms.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mms.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mms.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mms.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mms.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mmsh.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mmsh.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mmsh.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mmsh.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mmst.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mmst.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mmst.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mmst.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mov.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mov.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mov.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mov.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mov_chan.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mov_chan.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mov_chan.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mov_chan.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mov_chan.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mov_chan.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mov_chan.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mov_chan.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/movenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/movenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/movenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/movenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/movenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/movenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/movenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/movenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/movenchint.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/movenchint.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/movenchint.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/movenchint.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mp3dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mp3dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mp3dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mp3dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mp3enc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mp3enc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mp3enc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mp3enc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpc8.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpc8.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpc8.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpc8.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpeg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpeg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpeg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpeg.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpegenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpegenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpegts.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegts.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpegts.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegts.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpegts.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegts.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpegts.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegts.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpegtsenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegtsenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpegtsenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegtsenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpegvideodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegvideodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpegvideodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpegvideodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpjpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpjpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpjpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpjpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpl2dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpl2dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpl2dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpl2dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mpsubdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpsubdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mpsubdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mpsubdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/msnwc_tcp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/msnwc_tcp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/msnwc_tcp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/msnwc_tcp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mtv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mtv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mtv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mtv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mux.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mux.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mux.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mux.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mvi.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mvi.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mvi.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mvi.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mxf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mxf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mxf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mxf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxf.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mxfdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxfdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mxfdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxfdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mxfenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxfenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mxfenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxfenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/mxg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/mxg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/mxg.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/ncdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ncdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/ncdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/ncdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/network.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/network.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/network.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/network.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/network.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/network.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/network.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/network.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nistspheredec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nistspheredec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nistspheredec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nistspheredec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/noproxy-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/noproxy-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/noproxy-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/noproxy-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nsvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nsvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nsvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nsvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nullenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nullenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nullenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nullenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nut.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nut.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nut.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nut.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nut.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nut.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nut.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nut.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nutdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nutdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nutdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nutdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nutenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nutenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nutenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nutenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/nuv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nuv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/nuv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/nuv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparsecelt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsecelt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparsecelt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsecelt.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparsedirac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsedirac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparsedirac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsedirac.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparseflac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseflac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparseflac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseflac.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparseogm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseogm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparseogm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseogm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparseopus.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseopus.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparseopus.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseopus.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparseskeleton.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseskeleton.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparseskeleton.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparseskeleton.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparsespeex.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsespeex.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparsespeex.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsespeex.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparsetheora.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsetheora.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparsetheora.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsetheora.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oggparsevorbis.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsevorbis.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oggparsevorbis.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oggparsevorbis.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oma.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oma.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oma.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oma.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/oma.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oma.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/oma.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/oma.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/omadec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/omadec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/omadec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/omadec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/omaenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/omaenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/omaenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/omaenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/options.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/options.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/options.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/options.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/options_table.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/options_table.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/options_table.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/options_table.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/os_support.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/os_support.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/os_support.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/os_support.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/os_support.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/os_support.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/os_support.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/os_support.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/paf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/paf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/paf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/paf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pcm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pcm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pcm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pcm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcm.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pcmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pcmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pcmenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcmenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pcmenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pcmenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pjsdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pjsdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pjsdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pjsdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pmpdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pmpdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pmpdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pmpdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/psxstr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/psxstr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/psxstr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/psxstr.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pva.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pva.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pva.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pva.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/pvfdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pvfdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/pvfdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/pvfdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/qcp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/qcp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/qcp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/qcp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/qtpalette.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/qtpalette.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/qtpalette.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/qtpalette.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/r3d.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/r3d.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/r3d.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/r3d.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rawdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rawdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rawdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rawdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rawenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rawenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rawenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rawenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rawvideodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawvideodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rawvideodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rawvideodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rdt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rdt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rdt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rdt.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rdt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rdt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rdt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rdt.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/realtextdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/realtextdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/realtextdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/realtextdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/redspark.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/redspark.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/redspark.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/redspark.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/riff.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riff.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/riff.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riff.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/riff.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riff.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/riff.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riff.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/riffdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riffdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/riffdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riffdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/riffenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riffenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/riffenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/riffenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rl2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rl2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rl2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rl2.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rm.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rmdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rmdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rmenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rmenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rmsipr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmsipr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rmsipr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmsipr.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rmsipr.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmsipr.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rmsipr.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rmsipr.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rpl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rpl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rpl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rpl.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rsd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rsd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rsd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rsd.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rso.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rso.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rso.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rso.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rso.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rso.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rso.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rso.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rsodec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rsodec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rsodec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rsodec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rsoenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rsoenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rsoenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rsoenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmp.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmpcrypt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpcrypt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmpcrypt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpcrypt.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmpcrypt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpcrypt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmpcrypt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpcrypt.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmpdh.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpdh.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmpdh.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpdh.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmpdh.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpdh.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmpdh.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpdh.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmphttp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmphttp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmphttp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmphttp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmppkt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmppkt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmppkt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmppkt.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmppkt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmppkt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmppkt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmppkt.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtmpproto.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpproto.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtmpproto.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtmpproto.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtp.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_amr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_amr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_amr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_amr.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_asf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_asf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_asf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_asf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_formats.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_formats.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_formats.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_formats.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_g726.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_g726.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_g726.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_g726.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_h263.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_h263.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_h263.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_h263.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_h263_rfc2190.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_h263_rfc2190.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_h263_rfc2190.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_h263_rfc2190.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_h264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_h264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_h264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_h264.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_ilbc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_ilbc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_ilbc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_ilbc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_jpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_jpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_jpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_jpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_latm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_latm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_latm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_latm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_mpeg12.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_mpeg12.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_mpeg12.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_mpeg12.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_mpeg4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_mpeg4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_mpeg4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_mpeg4.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_mpegts.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_mpegts.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_mpegts.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_mpegts.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_qcelp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_qcelp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_qcelp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_qcelp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_qdm2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_qdm2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_qdm2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_qdm2.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_qt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_qt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_qt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_qt.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_svq3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_svq3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_svq3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_svq3.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_vp8.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_vp8.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_vp8.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_vp8.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpdec_xiph.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_xiph.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpdec_xiph.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpdec_xiph.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_aac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_aac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_aac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_aac.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_amr.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_amr.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_amr.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_amr.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_chain.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_chain.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_chain.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_chain.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_chain.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_chain.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_chain.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_chain.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_h263.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_h263.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_h263.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_h263.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_h263_rfc2190.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_h263_rfc2190.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_h263_rfc2190.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_h263_rfc2190.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_h264.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_h264.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_h264.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_h264.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_jpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_jpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_jpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_jpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_latm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_latm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_latm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_latm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_mpv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_mpv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_mpv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_mpv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_vp8.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_vp8.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_vp8.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_vp8.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpenc_xiph.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_xiph.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpenc_xiph.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpenc_xiph.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpproto.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpproto.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpproto.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpproto.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtpproto.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpproto.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtpproto.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtpproto.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtspcodes.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtspcodes.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtspcodes.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtspcodes.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtspdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtspdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtspdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtspdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/rtspenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtspenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/rtspenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/rtspenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/samidec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/samidec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/samidec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/samidec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sapdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sapdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sapdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sapdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sapenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sapenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sapenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sapenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sauce.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sauce.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sauce.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sauce.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sauce.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sauce.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sauce.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sauce.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sbgdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sbgdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sbgdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sbgdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sctp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sctp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sctp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sctp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sdp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sdp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sdp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sdp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/seek-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/seek-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/seek-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/seek-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/seek.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/seek.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/seek.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/seek.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/seek.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/seek.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/seek.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/seek.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/segafilm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/segafilm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/segafilm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/segafilm.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/segment.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/segment.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/segment.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/segment.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sierravmd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sierravmd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sierravmd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sierravmd.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/siff.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/siff.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/siff.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/siff.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/smacker.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smacker.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/smacker.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smacker.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/smjpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/smjpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/smjpeg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpeg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/smjpeg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpeg.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/smjpegdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpegdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/smjpegdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpegdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/smjpegenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpegenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/smjpegenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smjpegenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/smoothstreamingenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smoothstreamingenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/smoothstreamingenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smoothstreamingenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/smush.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smush.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/smush.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/smush.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sol.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sol.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sol.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sol.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/sox.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sox.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/sox.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/sox.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/soxdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/soxdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/soxdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/soxdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/soxenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/soxenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/soxenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/soxenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/spdif.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdif.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/spdif.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdif.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/spdif.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdif.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/spdif.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdif.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/spdifdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdifdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/spdifdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdifdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/spdifenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdifenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/spdifenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/spdifenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/srtdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/srtdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/srtenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/srtenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/srtp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/srtp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/srtp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/srtp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtp.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/srtpproto.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtpproto.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/srtpproto.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/srtpproto.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/subtitles.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subtitles.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/subtitles.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subtitles.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/subtitles.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subtitles.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/subtitles.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subtitles.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/subviewer1dec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subviewer1dec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/subviewer1dec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subviewer1dec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/subviewerdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subviewerdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/subviewerdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/subviewerdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/swf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/swf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/swf.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swf.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/swf.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swf.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/swfdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swfdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/swfdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swfdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/swfenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swfenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/swfenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/swfenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/takdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/takdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/takdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/takdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tcp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tcp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tcp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tcp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tedcaptionsdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tedcaptionsdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tedcaptionsdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tedcaptionsdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tee.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tee.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tee.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tee.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/thp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/thp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/thp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/thp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tiertexseq.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tiertexseq.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tiertexseq.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tiertexseq.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tls.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tls.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tls.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tls.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tmv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tmv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tmv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tmv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tta.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tta.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tta.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tta.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/tty.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tty.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/tty.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/tty.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/txd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/txd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/txd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/txd.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/udp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/udp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/udp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/udp.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/unix.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/unix.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/unix.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/unix.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/url-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/url-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/url-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/url-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/url.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/url.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/url.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/url.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/url.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/url.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/url.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/url.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/urldecode.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/urldecode.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/urldecode.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/urldecode.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/urldecode.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/urldecode.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/urldecode.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/urldecode.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/utils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/utils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/utils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/utils.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vc1test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vc1test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vc1test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vc1test.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vc1testenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vc1testenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vc1testenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vc1testenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/version.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/version.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/version.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/version.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vivo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vivo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vivo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vivo.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/voc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/voc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/voc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/voc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/voc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/voc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/voc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/voc.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vocdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vocdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vocdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vocdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vocenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vocenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vocenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vocenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vorbiscomment.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vorbiscomment.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vorbiscomment.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vorbiscomment.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vorbiscomment.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vorbiscomment.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vorbiscomment.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vorbiscomment.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vplayerdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vplayerdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vplayerdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vplayerdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/vqf.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vqf.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/vqf.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/vqf.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/w64.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/w64.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/w64.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/w64.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/w64.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/w64.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/w64.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/w64.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wavdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wavdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wavdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wavdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wavenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wavenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wavenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wavenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wc3movie.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wc3movie.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wc3movie.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wc3movie.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/webvttdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/webvttdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/webvttdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/webvttdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/webvttenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/webvttenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/webvttenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/webvttenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/westwood_aud.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/westwood_aud.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/westwood_aud.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/westwood_aud.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/westwood_vqa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/westwood_vqa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/westwood_vqa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/westwood_vqa.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wtv.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtv.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wtv.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtv.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wtv_common.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtv_common.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wtv_common.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtv_common.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wtvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wtvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wtvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wtvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wtvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wv.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wv.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wv.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wv.h diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wvdec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wvdec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wvdec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wvdec.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/wvenc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wvenc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/wvenc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/wvenc.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/xa.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/xa.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/xa.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/xa.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/xmv.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/xmv.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/xmv.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/xmv.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/xwma.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/xwma.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/xwma.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/xwma.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/yop.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/yop.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/yop.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/yop.c diff --git a/contrib/sdk/sources/ffmpeg/libavformat/yuv4mpeg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/yuv4mpeg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavformat/yuv4mpeg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavformat/yuv4mpeg.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavresample/arm/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/arm/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/arm/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/arm/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavresample/arm/audio_convert_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/arm/audio_convert_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/arm/audio_convert_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/arm/audio_convert_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/arm/audio_convert_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/arm/audio_convert_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/arm/audio_convert_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/arm/audio_convert_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavresample/audio_convert.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_convert.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/audio_convert.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_convert.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/audio_convert.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_convert.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/audio_convert.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_convert.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/audio_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/audio_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/audio_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/audio_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/audio_mix.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_mix.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/audio_mix.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_mix.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/audio_mix.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_mix.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/audio_mix.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_mix.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/audio_mix_matrix.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_mix_matrix.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/audio_mix_matrix.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/audio_mix_matrix.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/avresample-test.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/avresample-test.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/avresample-test.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/avresample-test.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/avresample.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/avresample.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/avresample.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/avresample.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/dither.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/dither.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/dither.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/dither.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/dither.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/dither.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/dither.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/dither.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/libavresample.v b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/libavresample.v similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/libavresample.v rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/libavresample.v diff --git a/contrib/sdk/sources/ffmpeg/libavresample/options.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/options.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/options.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/options.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/resample.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/resample.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/resample.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/resample.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/resample.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/resample.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/resample.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/resample.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/resample_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/resample_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/resample_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/resample_template.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/utils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/utils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/utils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/utils.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/version.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/version.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/version.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/version.h diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/audio_convert.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_convert.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/audio_convert.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_convert.asm diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/audio_convert_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_convert_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/audio_convert_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_convert_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/audio_mix.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_mix.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/audio_mix.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_mix.asm diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/audio_mix_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_mix_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/audio_mix_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/audio_mix_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/dither.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/dither.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/dither.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/dither.asm diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/dither_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/dither_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/dither_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/dither_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavresample/x86/util.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/util.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavresample/x86/util.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavresample/x86/util.asm diff --git a/contrib/sdk/sources/ffmpeg/libavutil/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavutil/adler32.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/adler32.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/adler32.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/adler32.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/adler32.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/adler32.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/adler32.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/adler32.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/aes.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/aes.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/aes.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/aes.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/aes.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/aes.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/aes.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/aes.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/asm.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/asm.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/asm.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/asm.S diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/bswap.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/bswap.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/bswap.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/bswap.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/cpu.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/cpu.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/cpu.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/cpu.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/cpu.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/cpu.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/cpu.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/cpu.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_arm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_arm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_arm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_arm.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_init_arm.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_init_arm.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_init_arm.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_init_arm.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_init_neon.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_init_neon.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_init_neon.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_init_neon.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_init_vfp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_init_vfp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_init_vfp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_init_vfp.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_neon.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_neon.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_neon.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_neon.S diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_vfp.S b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_vfp.S similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/float_dsp_vfp.S rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/float_dsp_vfp.S diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/intmath.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/intmath.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/intmath.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/intmath.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/intreadwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/intreadwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/intreadwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/intreadwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/arm/timer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/timer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/arm/timer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/arm/timer.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/atomic.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/atomic.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/atomic.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/atomic.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/atomic_gcc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic_gcc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/atomic_gcc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic_gcc.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/atomic_suncc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic_suncc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/atomic_suncc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic_suncc.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/atomic_win32.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic_win32.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/atomic_win32.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/atomic_win32.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/attributes.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/attributes.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/attributes.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/attributes.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/audio_fifo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/audio_fifo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/audio_fifo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/audio_fifo.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/audio_fifo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/audio_fifo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/audio_fifo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/audio_fifo.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/audioconvert.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/audioconvert.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/audioconvert.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/audioconvert.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avassert.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avassert.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avassert.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avassert.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avconfig.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avconfig.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avconfig.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avconfig.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avr32/bswap.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avr32/bswap.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avr32/bswap.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avr32/bswap.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avr32/intreadwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avr32/intreadwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avr32/intreadwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avr32/intreadwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avstring.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avstring.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avstring.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avstring.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avstring.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avstring.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avstring.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avstring.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avutil-52.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avutil-52.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avutil-52.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avutil-52.def diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avutil-52.orig.def b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avutil-52.orig.def similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avutil-52.orig.def rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avutil-52.orig.def diff --git a/contrib/sdk/sources/ffmpeg/libavutil/avutil.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avutil.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/avutil.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/avutil.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/base64.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/base64.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/base64.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/base64.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/base64.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/base64.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/base64.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/base64.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/bfin/bswap.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bfin/bswap.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/bfin/bswap.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bfin/bswap.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/bfin/timer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bfin/timer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/bfin/timer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bfin/timer.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/blowfish.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/blowfish.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/blowfish.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/blowfish.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/blowfish.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/blowfish.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/blowfish.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/blowfish.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/bprint.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bprint.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/bprint.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bprint.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/bprint.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bprint.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/bprint.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bprint.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/bswap.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bswap.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/bswap.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/bswap.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/buffer.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/buffer.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/buffer.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/buffer.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/buffer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/buffer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/buffer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/buffer.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/buffer_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/buffer_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/buffer_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/buffer_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/channel_layout.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/channel_layout.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/channel_layout.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/channel_layout.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/channel_layout.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/channel_layout.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/channel_layout.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/channel_layout.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/colorspace.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/colorspace.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/colorspace.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/colorspace.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/common.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/common.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/common.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/common.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/cpu.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/cpu.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/cpu.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/cpu.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/cpu.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/cpu.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/cpu.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/cpu.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/cpu_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/cpu_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/cpu_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/cpu_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/crc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/crc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/crc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/crc.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/crc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/crc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/crc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/crc.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/des.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/des.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/des.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/des.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/des.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/des.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/des.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/des.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/dict.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/dict.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/dict.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/dict.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/dict.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/dict.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/dict.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/dict.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/error.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/error.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/error.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/error.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/error.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/error.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/error.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/error.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/eval.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/eval.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/eval.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/eval.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/eval.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/eval.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/eval.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/eval.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/fifo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/fifo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/fifo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/fifo.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/fifo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/fifo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/fifo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/fifo.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/file.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/file.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/file.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/file.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/file.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/file.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/file.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/file.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/file_open.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/file_open.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/file_open.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/file_open.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/float_dsp.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/float_dsp.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/float_dsp.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/float_dsp.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/float_dsp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/float_dsp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/float_dsp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/float_dsp.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/frame.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/frame.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/frame.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/frame.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/frame.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/frame.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/frame.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/frame.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/hash.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hash.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/hash.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hash.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/hash.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hash.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/hash.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hash.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/hmac.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hmac.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/hmac.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hmac.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/hmac.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hmac.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/hmac.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/hmac.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/imgutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/imgutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/imgutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/imgutils.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/imgutils.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/imgutils.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/imgutils.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/imgutils.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/integer.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/integer.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/integer.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/integer.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/integer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/integer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/integer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/integer.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/intfloat.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intfloat.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/intfloat.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intfloat.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/intfloat_readwrite.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intfloat_readwrite.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/intfloat_readwrite.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intfloat_readwrite.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/intfloat_readwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intfloat_readwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/intfloat_readwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intfloat_readwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/intmath.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intmath.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/intmath.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intmath.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/intmath.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intmath.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/intmath.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intmath.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/intreadwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intreadwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/intreadwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/intreadwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lfg.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lfg.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lfg.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lfg.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lfg.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lfg.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lfg.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lfg.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/libavutil.pc b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libavutil.pc similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/libavutil.pc rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libavutil.pc diff --git a/contrib/sdk/sources/ffmpeg/libavutil/libavutil.v b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libavutil.v similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/libavutil.v rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libavutil.v diff --git a/contrib/sdk/sources/ffmpeg/libavutil/libavutil.ver b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libavutil.ver similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/libavutil.ver rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libavutil.ver diff --git a/contrib/sdk/sources/ffmpeg/libavutil/libm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/libm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/libm.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lls1.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls1.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lls1.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls1.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lls1.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls1.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lls1.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls1.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lls2.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls2.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lls2.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls2.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lls2.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls2.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lls2.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lls2.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/log.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/log.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/log.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/log.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/log.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/log.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/log.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/log.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/log2_tab.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/log2_tab.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/log2_tab.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/log2_tab.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lzo.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lzo.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lzo.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lzo.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/lzo.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lzo.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/lzo.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/lzo.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mathematics.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mathematics.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mathematics.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mathematics.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mathematics.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mathematics.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mathematics.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mathematics.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/md5.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/md5.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/md5.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/md5.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/md5.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/md5.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/md5.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/md5.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mem.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mem.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mem.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mem.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mem.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mem.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mem.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mem.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mips/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mips/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mips/float_dsp_mips.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/float_dsp_mips.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mips/float_dsp_mips.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/float_dsp_mips.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mips/intreadwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/intreadwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mips/intreadwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/intreadwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/mips/libm_mips.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/libm_mips.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/mips/libm_mips.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/mips/libm_mips.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/murmur3.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/murmur3.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/murmur3.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/murmur3.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/murmur3.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/murmur3.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/murmur3.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/murmur3.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/old_pix_fmts.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/old_pix_fmts.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/old_pix_fmts.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/old_pix_fmts.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/opencl.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/opencl.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/opencl.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/opencl.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/opencl_internal.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl_internal.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/opencl_internal.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl_internal.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/opencl_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/opencl_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opencl_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/opt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/opt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opt.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/opt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/opt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/opt.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/parseutils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/parseutils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/parseutils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/parseutils.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/parseutils.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/parseutils.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/parseutils.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/parseutils.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/pca.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pca.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/pca.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pca.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/pca.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pca.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/pca.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pca.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/pixdesc.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pixdesc.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/pixdesc.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pixdesc.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/pixdesc.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pixdesc.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/pixdesc.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pixdesc.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/pixfmt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pixfmt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/pixfmt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/pixfmt.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/cpu.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/cpu.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/cpu.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/cpu.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/cpu.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/cpu.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/cpu.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/cpu.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/float_dsp_altivec.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/float_dsp_altivec.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/float_dsp_altivec.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/float_dsp_altivec.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/float_dsp_altivec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/float_dsp_altivec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/float_dsp_altivec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/float_dsp_altivec.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/float_dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/float_dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/float_dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/float_dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/intreadwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/intreadwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/intreadwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/intreadwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/timer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/timer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/timer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/timer.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/types_altivec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/types_altivec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/types_altivec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/types_altivec.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ppc/util_altivec.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/util_altivec.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ppc/util_altivec.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ppc/util_altivec.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/qsort.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/qsort.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/qsort.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/qsort.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/random_seed.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/random_seed.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/random_seed.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/random_seed.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/random_seed.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/random_seed.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/random_seed.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/random_seed.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/rational.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rational.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/rational.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rational.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/rational.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rational.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/rational.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rational.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/rc4.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rc4.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/rc4.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rc4.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/rc4.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rc4.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/rc4.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/rc4.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ripemd.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ripemd.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ripemd.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ripemd.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/ripemd.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ripemd.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/ripemd.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/ripemd.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/samplefmt.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/samplefmt.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/samplefmt.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/samplefmt.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/samplefmt.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/samplefmt.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/samplefmt.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/samplefmt.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/sh4/bswap.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sh4/bswap.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/sh4/bswap.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sh4/bswap.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/sha.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/sha.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/sha.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/sha.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/sha512.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha512.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/sha512.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha512.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/sha512.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha512.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/sha512.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/sha512.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/softfloat.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/softfloat.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/softfloat.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/softfloat.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/softfloat.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/softfloat.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/softfloat.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/softfloat.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/time.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/time.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/time.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/time.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/time.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/time.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/time.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/time.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/timecode.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timecode.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/timecode.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timecode.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/timecode.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timecode.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/timecode.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timecode.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/timer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/timer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timer.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/timestamp.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timestamp.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/timestamp.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/timestamp.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/tomi/intreadwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/tomi/intreadwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/tomi/intreadwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/tomi/intreadwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/tree.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/tree.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/tree.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/tree.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/tree.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/tree.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/tree.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/tree.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/utils.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/utils.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/utils.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/utils.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/version.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/version.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/version.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/version.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/asm.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/asm.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/asm.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/asm.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/bswap.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/bswap.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/bswap.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/bswap.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/cpu.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/cpu.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/cpu.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/cpu.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/cpu.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/cpu.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/cpu.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/cpu.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/cpuid.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/cpuid.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/cpuid.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/cpuid.asm diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/emms.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/emms.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/emms.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/emms.asm diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/emms.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/emms.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/emms.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/emms.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/float_dsp.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/float_dsp.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/float_dsp.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/float_dsp.asm diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/float_dsp_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/float_dsp_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/float_dsp_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/float_dsp_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/intreadwrite.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/intreadwrite.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/intreadwrite.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/intreadwrite.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/lls.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/lls.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/lls.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/lls.asm diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/lls_init.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/lls_init.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/lls_init.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/lls_init.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/timer.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/timer.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/timer.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/timer.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/w64xmmtest.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/w64xmmtest.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/w64xmmtest.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/w64xmmtest.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/x86inc.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/x86inc.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/x86inc.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/x86inc.asm diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86/x86util.asm b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/x86util.asm similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86/x86util.asm rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86/x86util.asm diff --git a/contrib/sdk/sources/ffmpeg/libavutil/x86_cpu.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86_cpu.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/x86_cpu.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/x86_cpu.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/xga_font_data.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xga_font_data.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/xga_font_data.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xga_font_data.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/xga_font_data.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xga_font_data.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/xga_font_data.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xga_font_data.h diff --git a/contrib/sdk/sources/ffmpeg/libavutil/xtea.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xtea.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/xtea.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xtea.c diff --git a/contrib/sdk/sources/ffmpeg/libavutil/xtea.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xtea.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libavutil/xtea.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libavutil/xtea.h diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/Makefile b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/Makefile similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/Makefile rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/Makefile diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/libpostproc.v b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/libpostproc.v similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/libpostproc.v rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/libpostproc.v diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/postprocess.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/postprocess.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess.c diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/postprocess.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/postprocess.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess.h diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/postprocess_altivec_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess_altivec_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/postprocess_altivec_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess_altivec_template.c diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/postprocess_internal.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess_internal.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/postprocess_internal.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess_internal.h diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/postprocess_template.c b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess_template.c similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/postprocess_template.c rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/postprocess_template.c diff --git a/contrib/sdk/sources/ffmpeg/libpostproc/version.h b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/version.h similarity index 100% rename from contrib/sdk/sources/ffmpeg/libpostproc/version.h rename to contrib/sdk/sources/ffmpeg/ffmpeg-2.1/libpostproc/version.h diff --git a/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/library.mak b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/library.mak new file mode 100644 index 000000000..ac94c1793 --- /dev/null +++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.1/library.mak @@ -0,0 +1,116 @@ +include $(SRC_PATH)/common.mak + +LIBVERSION := $(lib$(NAME)_VERSION) +LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) +LIBMINOR := $(lib$(NAME)_VERSION_MINOR) +INCINSTDIR := $(INCDIR)/lib$(NAME) + +INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%) + +all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) +all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) + +$(SUBDIR)%-test.o: $(SUBDIR)%-test.c + $(COMPILE_C) + +$(SUBDIR)%-test.o: $(SUBDIR)%.c + $(COMPILE_C) + +$(SUBDIR)%-test.i: $(SUBDIR)%-test.c + $(CC) $(CCFLAGS) $(CC_E) $< + +$(SUBDIR)%-test.i: $(SUBDIR)%.c + $(CC) $(CCFLAGS) $(CC_E) $< + +$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm + $(DEPYASM) $(YASMFLAGS) -I $( $(@:.o=.d) + $(YASM) $(YASMFLAGS) -I $(