Commit fa8e4783 authored by Rafaël Carré's avatar Rafaël Carré

Remove avcodec patch: use option

parent 9ac50677
From dee03508f38b5101cf5b58f3c795dfdb384e1dc6 Mon Sep 17 00:00:00 2001
From: Ludovic Fauvet <etix@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
......@@ -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",
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment