[Android] patches: Enable avcodec threading back again

[Ludovic Fauvet]

vlc-ports/android | branch: master | Ludovic Fauvet <etix at videolan.org> | Tue Sep 25 19:09:54 2012 +0200| [9fc4262486d7b24ae441cde4939ba6c7a5cd356c] | committer: Ludovic Fauvet

patches: Enable avcodec threading back again

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=9fc4262486d7b24ae441cde4939ba6c7a5cd356c
---

 ...vert-avcodec-disable-threading-by-default.patch |   26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/patches/0006-Revert-avcodec-disable-threading-by-default.patch b/patches/0006-Revert-avcodec-disable-threading-by-default.patch
new file mode 100644
index 0000000..08763ba
--- /dev/null
+++ b/patches/0006-Revert-avcodec-disable-threading-by-default.patch
@@ -0,0 +1,26 @@
+From 9552d400be547dde2bce2af1c2b0a48bd5fa9abd Mon Sep 17 00:00:00 2001
+From: Ludovic Fauvet <etix at videolan.org>
+Date: Tue, 25 Sep 2012 18:40:05 +0200
+Subject: [PATCH 6/6] Revert "avcodec: disable threading by default"
+
+This reverts commit 8d59ba01d33c96d61db5e0e7ab9b8a30b052ebab.
+---
+ modules/codec/avcodec/avcodec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
+index 2176b74..1adc2a2 100644
+--- a/modules/codec/avcodec/avcodec.c
++++ b/modules/codec/avcodec/avcodec.c
+@@ -159,7 +159,7 @@ vlc_module_begin ()
+ #endif
+ #if defined(FF_THREAD_FRAME)
+     add_obsolete_integer( "ffmpeg-threads" ) /* removed since 2.1.0 */
+-    add_integer( "avcodec-threads", 1, THREADS_TEXT, THREADS_LONGTEXT, true );
++    add_integer( "avcodec-threads", 0, THREADS_TEXT, THREADS_LONGTEXT, true );
+ #endif
+ 
+ 
+-- 
+1.7.12.1
+