[vlc-commits] Revert "Contribs: use latest commit before lavc 54 jump"

Rafaël Carré git at videolan.org
Tue Feb 28 08:39:05 CET 2012


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Feb 28 02:37:24 2012 -0500| [7bbf79a4a9c3f845a08c1a3ed4579168d14d04a9] | committer: Rafaël Carré

Revert "Contribs: use latest commit before lavc 54 jump"

This reverts commit 61426c7c15b879c8fc51852d1e77931a88cf6727.

Conflicts:

	contrib/src/ffmpeg/rules.mak

Modules have been updated to new API

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 7a326bd..84552ba 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=570f6aaab12e2bc;sf=tgz
-FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=570f6aaab12e2bc;sf=tgz
+#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz
+FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=HEAD;sf=tgz
 
 FFMPEGCONF = \
 	--cc="$(CC)" \



More information about the vlc-commits mailing list