diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-20 11:41:05 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-20 11:41:05 -0300 |
commit | 0d18015803bebeb58911bf791653597291056095 (patch) | |
tree | df21e7972fd9d4555942dbad0bde22066ebf95f3 /extra/vlc/vlc-1.1.10-libavformat.patch | |
parent | 2f352ca8b911d96566b10adc049f76a552ab93aa (diff) | |
parent | 3da6b13f1eb136d0899bd2e8dd217048bb4d9030 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/keysafe/PKGBUILD
community/lesspipe/PKGBUILD
community/xchat-systray-integration/PKGBUILD
core/gen-init-cpio/PKGBUILD
extra/xarchiver/PKGBUILD
Diffstat (limited to 'extra/vlc/vlc-1.1.10-libavformat.patch')
-rw-r--r-- | extra/vlc/vlc-1.1.10-libavformat.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/extra/vlc/vlc-1.1.10-libavformat.patch b/extra/vlc/vlc-1.1.10-libavformat.patch deleted file mode 100644 index 4bec72334..000000000 --- a/extra/vlc/vlc-1.1.10-libavformat.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 21260bbb732d9de5540f809e1a54bde740f12a95 Mon Sep 17 00:00:00 2001 -From: Laurent Aimar <fenrir@videolan.org> -Date: Tue, 7 Jun 2011 00:43:56 +0200 -Subject: [PATCH] Fix ByteIOContext init on recent libavformat - -Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> -(cherry picked from commit 4fc3bd15a3844e41a75760fa8e100feecea969a5) - -Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> ---- - modules/demux/avformat/demux.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c -index fbb0b28..bd7c166 100644 ---- a/modules/demux/avformat/demux.c -+++ b/modules/demux/avformat/demux.c -@@ -210,6 +210,9 @@ int OpenDemux( vlc_object_t *p_this ) - */ - p_sys->url.is_streamed = 1; - p_sys->io.is_streamed = 1; -+#if defined(AVIO_SEEKABLE_NORMAL) -+ p_sys->io.seekable = 0; -+#endif - } - - --- -1.7.2.5 |