Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
b6ca26bb
Commit
b6ca26bb
authored
Jan 28, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: remove unnecessary patch.
parent
f09786cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
76 deletions
+0
-76
extras/contrib/src/Patches/ffmpeg-svn-avdevices.patch
extras/contrib/src/Patches/ffmpeg-svn-avdevices.patch
+0
-76
No files found.
extras/contrib/src/Patches/ffmpeg-svn-avdevices.patch
deleted
100644 → 0
View file @
f09786cf
--- ffmpeg/configure.orig 2007-11-23 09:07:23.000000000 +0100
+++ ffmpeg/configure 2007-11-23 10:54:15.000000000 +0100
@@ -130,6 +130,7 @@
echo " --disable-ffmpeg disable ffmpeg build"
echo " --disable-ffserver disable ffserver build"
echo " --disable-ffplay disable ffplay build"
+ echo " --enable-avdevices enable avdevices build"
echo " --enable-small optimize for size instead of speed"
echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers"
echo " --disable-encoder=NAME disables encoder NAME"
@@ -603,6 +604,7 @@
ffmpeg
ffplay
ffserver
+ avdevices
gpl
gprof
gray
--- ffmpeg/Makefile.orig 2007-11-23 11:06:07.000000000 +0100
+++ ffmpeg/Makefile 2007-11-23 11:09:55.000000000 +0100
@@ -61,8 +61,13 @@
VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c
-LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
-EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
+LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
+EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
+
+ifeq ($(CONFIG_AVDEVICES),yes)
+LDFLAGS+=-L$(BUILD_ROOT)/libavdevice
+EXTRALIBS+=-lavdevice$(BUILDSUF)
+endif
ifeq ($(CONFIG_SWSCALER),yes)
LDFLAGS+=-L$(BUILD_ROOT)/libswscale
@@ -75,7 +80,9 @@
$(MAKE) -C libavutil all
$(MAKE) -C libavcodec all
$(MAKE) -C libavformat all
+ifeq ($(CONFIG_AVDEVICES),yes)
$(MAKE) -C libavdevice all
+endif
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc all
endif
@@ -167,7 +174,9 @@
$(MAKE) -C libavutil install-libs
$(MAKE) -C libavcodec install-libs
$(MAKE) -C libavformat install-libs
+ifeq ($(CONFIG_AVDEVICES),yes)
$(MAKE) -C libavdevice install-libs
+endif
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc install-libs
endif
@@ -183,7 +192,9 @@
$(MAKE) -C libavutil install-headers
$(MAKE) -C libavcodec install-headers
$(MAKE) -C libavformat install-headers
+ifeq ($(CONFIG_AVDEVICES),yes)
$(MAKE) -C libavdevice install-headers
+endif
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc install-headers
endif
@@ -224,7 +235,9 @@
$(MAKE) -C libavutil depend
$(MAKE) -C libavcodec depend
$(MAKE) -C libavformat depend
+ifeq ($(CONFIG_AVDEVICES),yes)
$(MAKE) -C libavdevice depend
+endif
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc depend
endif
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