[Android] Remove avcodec patch: use option

[Rafaël Carré]

vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Fri Oct  5 14:02:32 2012 +0200| [fa8e4783db6693b61f8980775a584e4caee7a1dc] | committer: Rafaël Carré

Remove avcodec patch: use option

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

 ...vert-avcodec-disable-threading-by-default.patch |   26 --------------------
 vlc-android/jni/libvlcjni.c                        |    1 +
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/patches/0006-Revert-avcodec-disable-threading-by-default.patch b/patches/0006-Revert-avcodec-disable-threading-by-default.patch
deleted file mode 100644
index 8672f39..0000000
--- a/patches/0006-Revert-avcodec-disable-threading-by-default.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dee03508f38b5101cf5b58f3c795dfdb384e1dc6 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
-
diff --git a/vlc-android/jni/libvlcjni.c b/vlc-android/jni/libvlcjni.c
index 9a27c95..42ca612 100644
--- a/vlc-android/jni/libvlcjni.c
+++ b/vlc-android/jni/libvlcjni.c
@@ -424,6 +424,7 @@ void Java_org_videolan_vlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz, jboolean
         "--no-plugins-cache",
         "--no-drop-late-frames",
         "--avcodec-fast",
+        "--avcodec-threads=0",
         enable_time_stretch ? "--audio-time-stretch" : "--no-audio-time-stretch",
         use_opensles ? "--aout=opensles" : "--aout=android_audiotrack",
     };