[vlc-commits] Contribs: update sha1 for libav/FFmpeg

Jean-Baptiste Kempf git at videolan.org
Tue Mar 19 13:03:41 CET 2013


vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar 19 12:59:54 2013 +0100| [a93560048de2e185a0a7123152bdb4a7039512c4] | committer: Jean-Baptiste Kempf

Contribs: update sha1 for libav/FFmpeg

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/ffmpeg/rules.mak |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 9ce78c3..42dc128 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,7 +1,7 @@
 # FFmpeg
 
-#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=82db8ee;sf=tgz
-FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=1a8c6917f68;sf=tgz
+#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=23eed00;sf=tgz
+FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=eae0879;sf=tgz
 
 FFMPEGCONF = \
 	--cc="$(CC)" \
@@ -128,8 +128,6 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
 ifdef HAVE_WIN32
 	sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
 endif
-	$(APPLY) $(SRC)/ffmpeg/libavcodec-a25d912.patch
-	$(APPLY) $(SRC)/ffmpeg/swfdec.patch
 	$(MOVE)
 
 .ffmpeg: ffmpeg



More information about the vlc-commits mailing list