[vlc-devel] commit: Revert "Contrib: block FFmpeg revision until dxva2 patch is updated for HEAD" ( Laurent Aimar )

git version control git at videolan.org
Tue Dec 8 22:01:06 CET 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Dec  8 22:00:38 2009 +0100| [64d3a24136736e7196b2016c16824f34d7958601] | committer: Laurent Aimar 

Revert "Contrib: block FFmpeg revision until dxva2 patch is updated for HEAD"

This reverts commit 1e56f368a9662b7fa59bf33242b816c6e0995d2b.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=64d3a24136736e7196b2016c16824f34d7958601
---

 extras/contrib/src/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 54a873c..73f2791 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1024,7 +1024,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co -r 20620 $(FFMPEG_SVN) ffmpeg
+	$(SVN) co $(FFMPEG_SVN) ffmpeg
 ifdef HAVE_ISA_THUMB
 	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
 endif




More information about the vlc-devel mailing list