patches: remove patches merged upstream and update hash

buildAspenProject.sh

@@ -9,7 +9,7 @@ SDK=iphoneos6.1
 SDK_MIN=5.1
 VERBOSE=no
 CONFIGURATION="Release"
-TESTEDHASH=fcbbb7f41
+TESTEDHASH=9adaef965
 TESTEDVLCKITHASH=c4909a8fe
 TESTEDMEDIALIBRARYKITHASH=1a0dda33b
 

patches/0011-Revert-audiounit_ios-try-to-handle-data-drops-more-e.patch

@@ -1,35 +0,0 @@
-From 088da4f6c2f44e725e9c4ab3166010ff32cfab71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Tue, 23 Jul 2013 16:39:30 +0300
-Subject: [PATCH 11/13] Revert "audiounit_ios: try to handle data drops more
- efficiently"
-
-This (more or less) reverts commit
-2b7e016807507b632b8e0a7c874030bdffb2f604.
-
-Stopping the aout from within the callback like this could
-lead to deadlocks, where AudioOutputUnitStop in the callback thread
-and AudioOutputUnitStart in the audio decoder thread blocked each
-other (noticed at startup of playback on a 3GS with iOS 6.0).
----
- modules/audio_output/audiounit_ios.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/audio_output/audiounit_ios.c b/modules/audio_output/audiounit_ios.c
-index 1faaf58..974d172 100644
---- a/modules/audio_output/audiounit_ios.c
-+++ b/modules/audio_output/audiounit_ios.c
-@@ -383,8 +383,8 @@ static OSStatus RenderCallback(vlc_object_t *p_obj,
- 
-     /* check if we have enough data */
-     if (!availableBytes) {
--        /* bail out and restart unit the next time we receive some data */
--        Flush(p_aout, false);
-+        /* return an empty buffer so silence is played until we have data */
-+        memset(targetBuffer, 0, bytesToCopy);
-     } else {
-         memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
-         TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
-1.7.12.4 (Apple Git-37)
-

patches/0012-audiounit_ios-Fill-the-remainder-of-the-buffer-with-.patch

@@ -1,29 +0,0 @@
-From 9b81c559d754f5e75b61fbc43e1c467d89bb9f10 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Tue, 23 Jul 2013 16:58:36 +0300
-Subject: [PATCH 12/13] audiounit_ios: Fill the remainder of the buffer with
- zeros
-
-If we didn't have enough data to fill the buffer, fill the rest
-of it with zeros. This is better than playing back whatever happened
-to be there from before.
----
- modules/audio_output/audiounit_ios.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules/audio_output/audiounit_ios.c b/modules/audio_output/audiounit_ios.c
-index 974d172..b780fd0 100644
---- a/modules/audio_output/audiounit_ios.c
-+++ b/modules/audio_output/audiounit_ios.c
-@@ -389,6 +389,8 @@ static OSStatus RenderCallback(vlc_object_t *p_obj,
-         memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
-         TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
-         VLC_UNUSED(inNumberFrames);
-+        if (availableBytes < bytesToCopy)
-+            memset((uint8_t*) targetBuffer + availableBytes, 0, bytesToCopy - availableBytes);
-     }
- 
-     return noErr;
-1.7.12.4 (Apple Git-37)
-