Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
b49f27fc
Commit
b49f27fc
authored
Feb 06, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: move to a git downloaded ffmpeg/libav
parent
4b1dbb7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+6
-4
No files found.
contrib/src/ffmpeg/rules.mak
View file @
b49f27fc
...
...
@@ -7,9 +7,11 @@
ifdef
USE_FFMPEG
HASH
=
HEAD
FFMPEG_SNAPURL
:=
http://git.videolan.org/?p
=
ffmpeg.git
;
a
=
snapshot
;
h
=
$(HASH)
;
sf
=
tgz
FFMPEG_GITURL
:=
git://git.videolan.org/ffmpeg.git
else
HASH
=
HEAD
FFMPEG_SNAPURL
:=
http://git.libav.org/?p
=
libav.git
;
a
=
snapshot
;
h
=
$(HASH)
;
sf
=
tgz
FFMPEG_GITURL
:=
git://git.libav.org/libav.git
endif
FFMPEGCONF
=
\
...
...
@@ -163,14 +165,14 @@ endif
FFMPEGCONF
+=
--nm
=
"
$(NM)
"
--ar
=
"
$(AR)
"
$(TARBALLS)/ffmpeg-$(HASH).tar.
g
z
:
$(
call
download
,
$(FFMPEG_SNAPURL
)
)
$(TARBALLS)/ffmpeg-$(HASH).tar.
x
z
:
$(
call
download
_git,
$(FFMPEG_GITURL)
,,
$(HASH
)
)
.sum-ffmpeg
:
$(TARBALLS)/ffmpeg-$(HASH).tar.
g
z
.sum-ffmpeg
:
$(TARBALLS)/ffmpeg-$(HASH).tar.
x
z
$(
warning
Not implemented.
)
touch
$@
ffmpeg
:
ffmpeg-$(HASH).tar.
g
z .sum-ffmpeg
ffmpeg
:
ffmpeg-$(HASH).tar.
x
z .sum-ffmpeg
rm
-Rf
$@
$@
-
$(HASH)
mkdir
-p
$@
-
$(HASH)
$(XZCAT)
"
$<
"
|
(
cd
$@
-
$(HASH)
&&
tar
xv
--strip-components
=
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment