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
f81c081c
Commit
f81c081c
authored
Jan 28, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs - Remove unnecessary ffmpeg patch merged in trunnk.
parent
060298d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
16 deletions
+1
-16
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-2
extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch
extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch
+0
-14
No files found.
extras/contrib/src/Makefile
View file @
f81c081c
...
...
@@ -1038,8 +1038,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef
SVN
ffmpeg
:
$(SVN)
co
$(FFMPEG_SVN)
ffmpeg
(
cd
"
$@
"
&&
patch
-p0
< ../Patches/ffmpeg-svn-swscale-pc.patch
&&
\
patch
-p1
< ../Patches/ffmpeg-svn-avdevices.patch
)
(
cd
"
$@
"
&&
patch
-p1
< ../Patches/ffmpeg-svn-avdevices.patch
)
ifeq
($(HOST),i586-pc-beos)
(
cd
$@
;
patch
-p0
< ../Patches/ffmpeg-svn-beos.patch
)
endif
...
...
extras/contrib/src/Patches/ffmpeg-svn-swscale-pc.patch
deleted
100644 → 0
View file @
060298d2
Index: Makefile
===================================================================
--- Makefile (revision 8597)
+++ Makefile (working copy)
@@ -149,7 +149,9 @@
ifeq ($(CONFIG_PP),yes)
(MAKE) -C libpostproc install-headers
endif
+ifeq ($(CONFIG_SWSCALER),yes)
$(MAKE) -C libswscale install-headers
+endif
uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
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