[Android] Bump hash and remove obsolete patch
Rafaël Carré
git at videolan.org
Tue Dec 18 23:43:24 CET 2012
vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Tue Dec 18 23:43:13 2012 +0100| [dd0c9d2d9e41b7d9bc7139fb2fa84ef205d000b9] | committer: Rafaël Carré
Bump hash and remove obsolete patch
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=dd0c9d2d9e41b7d9bc7139fb2fa84ef205d000b9
---
compile.sh | 2 +-
patches/0003-Audiotrack-Implement-Flush.patch | 49 -------------------------
2 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/compile.sh b/compile.sh
index 01f0de7..fe8f1bc 100755
--- a/compile.sh
+++ b/compile.sh
@@ -83,7 +83,7 @@ NDK_TOOLCHAIN_PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`un
export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
# 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=b2b4c52ac6
+TESTED_HASH=141c6716f8f2
if [ ! -d "vlc" ]; then
echo "VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
diff --git a/patches/0003-Audiotrack-Implement-Flush.patch b/patches/0003-Audiotrack-Implement-Flush.patch
deleted file mode 100644
index 22bca90..0000000
--- a/patches/0003-Audiotrack-Implement-Flush.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a6ea4dec42c3b0735239899bb7d6522c65e41c93 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Toque?= <xilasz at gmail.com>
-Date: Tue, 4 Dec 2012 19:27:50 +0100
-Subject: [PATCH 3/3] Audiotrack: Implement Flush
-
----
- modules/audio_output/audiotrack.c | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
-index bea55ff..9247aa4 100644
---- a/modules/audio_output/audiotrack.c
-+++ b/modules/audio_output/audiotrack.c
-@@ -122,6 +122,7 @@ static int Open(vlc_object_t *);
- static void Close(vlc_object_t *);
- static void Play(audio_output_t*, block_t*);
- static void Pause (audio_output_t *, bool, mtime_t);
-+static void Flush (audio_output_t *, bool);
-
- vlc_module_begin ()
- set_shortname("AudioTrack")
-@@ -277,6 +278,7 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
- aout->time_get = NULL;
- aout->play = Play;
- aout->pause = Pause;
-+ aout->flush = Flush;
-
- p_sys->at_start(p_sys->AudioTrack);
-
-@@ -321,6 +323,16 @@ static void Pause(audio_output_t *p_aout, bool pause, mtime_t date)
- }
- }
-
-+static void Flush (audio_output_t *p_aout, bool wait)
-+{
-+ VLC_UNUSED(wait); /* FIXME implement drain */
-+ aout_sys_t *p_sys = p_aout->sys;
-+
-+ p_sys->at_stop(p_sys->AudioTrack);
-+ p_sys->at_flush(p_sys->AudioTrack);
-+ p_sys->at_start(p_sys->AudioTrack);
-+}
-+
- static int Open(vlc_object_t *obj)
- {
- audio_output_t *aout = (audio_output_t *)obj;
---
-1.7.5.4
-
More information about the Android
mailing list