diff --git a/vlc-avcodec-encoder-single-threaded.patch b/vlc-avcodec-encoder-single-threaded.patch
new file mode 100644
index 0000000..2558fc6
--- /dev/null
+++ b/vlc-avcodec-encoder-single-threaded.patch
@@ -0,0 +1,23 @@
+From 5a43de506f31e1fa5460f8b62e25a1d640136597 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
+Date: Tue, 28 May 2013 11:29:07 +0200
+Subject: [PATCH] avcodec encoder: disable multithreading
+
+More work is needed before we can support it
+Close #8544
+---
+ modules/codec/avcodec/encoder.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: vlc-2.0.8/modules/codec/avcodec/encoder.c
+===================================================================
+--- vlc-2.0.8.orig/modules/codec/avcodec/encoder.c
++++ vlc-2.0.8/modules/codec/avcodec/encoder.c
+@@ -354,6 +354,7 @@ int OpenEncoder( vlc_object_t *p_this )
+ #endif
+     p_sys->p_context = p_context;
+     p_sys->p_context->codec_id = p_sys->p_codec->id;
++    p_context->thread_type = 0;
+     p_context->debug = var_InheritInteger( p_enc, "ffmpeg-debug" );
+     p_context->opaque = (void *)p_this;
+ 
diff --git a/vlc.changes b/vlc.changes
index dfaa57f..b16247c 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -18,6 +18,8 @@ Tue Jul 30 18:03:49 UTC 2013 - dimstar@opensuse.org
     - Respect "playlist-autostart" option.
   + Updated translations.
 - Drop vlc-vaapi.patch: fixed upstream.
+- Add vlc-avcodec-encoder-single-threaded.patch: disable
+  multithreading for avcodec encoder for now. Taken from git.
 
 -------------------------------------------------------------------
 Sun Jul 28 21:38:22 UTC 2013 - reddwarf@opensuse.org
diff --git a/vlc.spec b/vlc.spec
index 7d87450..783840e 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -36,6 +36,8 @@ Release:        0
 Source:         http://download.videolan.org/vlc/%{_version}/vlc-%{_version}.tar.xz
 Patch1:         fix_font_path.patch
 Patch3:         0001-no-return-in-non-void.patch
+# PATCH-FIX-UPSTREAM vlc-avcodec-encoder-single-threaded.patch dimstar@opensuse.org -- Disable avcodec encoder multithreading for now, taken from git.
+Patch4:         vlc-avcodec-encoder-single-threaded.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  aalib-devel
 BuildRequires:  alsa-devel
@@ -251,6 +253,7 @@ date
 %setup -q -n %{name}-%{_version}
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 rm -rf contrib
 echo '********* ENDED PREP PHASE *********'
 date