Skip to content

V
vlc
Commit b49f27fc authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: move to a git downloaded ffmpeg/libav

parent 4b1dbb7f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
contrib/src/ffmpeg/rules.mak
View file @ b49f27fc
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
ifdef USE_FFMPEG ifdef USE_FFMPEG
HASH=HEAD HASH=HEAD
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
else else
HASH=HEAD HASH=HEAD
FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz
FFMPEG_GITURL := git://git.libav.org/libav.git
endif endif
FFMPEGCONF = \ FFMPEGCONF = \
...@@ -163,14 +165,14 @@ endif ...@@ -163,14 +165,14 @@ endif
FFMPEGCONF += --nm="$(NM)" --ar="$(AR)" FFMPEGCONF += --nm="$(NM)" --ar="$(AR)"
$(TARBALLS)/ffmpeg-$(HASH).tar.gz: $(TARBALLS)/ffmpeg-$(HASH).tar.xz:
$(call download,$(FFMPEG_SNAPURL)) $(call download_git,$(FFMPEG_GITURL),,$(HASH))
.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(HASH).tar.gz .sum-ffmpeg: $(TARBALLS)/ffmpeg-$(HASH).tar.xz
$(warning Not implemented.) $(warning Not implemented.)
touch $@ touch $@
ffmpeg: ffmpeg-$(HASH).tar.gz .sum-ffmpeg ffmpeg: ffmpeg-$(HASH).tar.xz .sum-ffmpeg
rm -Rf $@ $@-$(HASH) rm -Rf $@ $@-$(HASH)
mkdir -p $@-$(HASH) mkdir -p $@-$(HASH)
$(XZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1) $(XZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=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