[vlc-commits] avcodec: disable threading by default

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 15 21:33:05 2012 +0300| [c7f64b557f510ed77a31e3700a7e7a2c99a35f32] | committer: Rémi Denis-Courmont

avcodec: disable threading by default

Threading does not currently work with some codec profiles and is thus
not suited as default. Threading is also known to deadlock in certain
circumstances, such as if no data is ever received (a rather common
scenario with network or DVB reception).

Fixed avcodec version should be checked before this is re-enabled.

Acked-by: Ilkka Ollakka <ileoo at videolan.org>
(cherry picked from commit 8d59ba01d33c96d61db5e0e7ab9b8a30b052ebab)

Conflicts:
	modules/codec/avcodec/avcodec.c

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=c7f64b557f510ed77a31e3700a7e7a2c99a35f32
---

 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 cd811e9..db1edd4 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -132,7 +132,7 @@ vlc_module_begin ()
     add_bool( "ffmpeg-hw", false, HW_TEXT, HW_LONGTEXT, false )
 #endif
 #if defined(FF_THREAD_FRAME)
-    add_integer( "ffmpeg-threads", 0, THREADS_TEXT, THREADS_LONGTEXT, true );
+    add_integer( "ffmpeg-threads", 1, THREADS_TEXT, THREADS_LONGTEXT, true );
 #endif