Commit 6907b236 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Merge branch 'master' of git@git.videolan.org:vlc

parents fcae9e71 a67c1100
......@@ -98,7 +98,7 @@ LIBMATROSKA_VERSION=0.8.1
LIBMATROSKA_URL=$(VIDEOLAN)/testing/contrib/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
FFMPEG_VERSION=0.4.8
FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
LIBDVDCSS_VERSION=1.2.9
LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
LIBDVDNAV_VERSION=4.1.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment