Commit c038bbd9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix opening of multiple files with ffmpeg SVN

(this is a revert of ffmpeg [7589])
parent 7520d1a1
...@@ -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
......
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) {
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