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
c038bbd9
Commit
c038bbd9
authored
Feb 10, 2007
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix opening of multiple files with ffmpeg SVN
(this is a revert of ffmpeg [7589])
parent
7520d1a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+1
-0
extras/contrib/src/Patches/ffmpeg-svn-nofile.patch
extras/contrib/src/Patches/ffmpeg-svn-nofile.patch
+13
-0
No files found.
extras/contrib/src/Makefile
View file @
c038bbd9
...
@@ -899,6 +899,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
...
@@ -899,6 +899,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg
:
ffmpeg
:
$(SVN)
export
$(FFMPEG_SVN)
ffmpeg
$(SVN)
export
$(FFMPEG_SVN)
ffmpeg
(
cd
"
$@
"
&&
patch
-p1
< ../Patches/ffmpeg-svn-nofile.patch
)
ifeq
($(HOST),i586-pc-beos)
ifeq
($(HOST),i586-pc-beos)
(
cd
$@
;
patch
-p0
< ../Patches/ffmpeg-svn-beos.patch
)
(
cd
$@
;
patch
-p0
< ../Patches/ffmpeg-svn-beos.patch
)
endif
endif
...
...
extras/contrib/src/Patches/ffmpeg-svn-nofile.patch
0 → 100644
View file @
c038bbd9
Index: ffmpeg/libavformat/utils.c
===================================================================
--- ffmpeg/libavformat/utils.c (révision 7907)
+++ ffmpeg/libavformat/utils.c (copie de travail)
@@ -282,7 +282,7 @@
fmt = NULL;
score_max = 0;
for(fmt1 = first_iformat; fmt1 != NULL; fmt1 = fmt1->next) {
- if (!is_opened == !(fmt1->flags & AVFMT_NOFILE))
+ if (!is_opened && !(fmt1->flags & AVFMT_NOFILE))
continue;
score = 0;
if (fmt1->read_probe) {
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