diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0036-latm_fix_initialization_on_some_streams.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0036-latm_fix_initialization_on_some_streams.patch
new file mode 100644
index 0000000000..de9e161e41
--- /dev/null
+++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0036-latm_fix_initialization_on_some_streams.patch
@@ -0,0 +1,28 @@
+From 06d713fefaf19cb4dfb83126ba1c078d6dcabc67 Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Tue, 25 Dec 2012 08:35:36 +0100
+Subject: [PATCH] ffmpeg: backport latm: fix initialization on some streams
+ when no extradata is available:
+ d039b6074ca68da9b6dc88d8bb40056fee9fecb6
+
+---
+ libavcodec/aacdec.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
+index 5c6404e..ad2991b 100644
+--- a/libavcodec/aacdec.c
++++ b/libavcodec/aacdec.c
+@@ -2403,7 +2403,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
+     if (bits_consumed < 0)
+         return AVERROR_INVALIDDATA;
+ 
+-    if (ac->m4ac.sample_rate != m4ac.sample_rate ||
++    if (!latmctx->initialized ||
++        ac->m4ac.sample_rate != m4ac.sample_rate ||
+         ac->m4ac.chan_config != m4ac.chan_config) {
+ 
+         av_log(avctx, AV_LOG_INFO, "audio config changed\n");
+-- 
+1.7.10
+
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0037-fixed_missing_S_DVBSUB_subtitles.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0037-fixed_missing_S_DVBSUB_subtitles.patch
new file mode 100644
index 0000000000..7d3bcf87ce
--- /dev/null
+++ b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-0037-fixed_missing_S_DVBSUB_subtitles.patch
@@ -0,0 +1,24 @@
+From 9066d83f0f237d90fe0c2d9b6202bb8cd59a6562 Mon Sep 17 00:00:00 2001
+From: Allan Kristensen <allank@tigerdyr.com>
+Date: Fri, 21 Dec 2012 21:04:18 +0100
+Subject: [PATCH] [ffmpeg] fixed missing S_DVBSUB subtitles
+
+---
+ libavformat/matroska.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libavformat/matroska.c b/libavformat/matroska.c
+index 2f5b617..11c2fa5 100644
+--- a/libavformat/matroska.c
++++ b/libavformat/matroska.c
+@@ -59,6 +59,7 @@
+     {"S_ASS"            , CODEC_ID_SSA},
+     {"S_SSA"            , CODEC_ID_SSA},
+     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
++    {"S_DVBSUB"         , CODEC_ID_DVB_SUBTITLE},
+     {"S_HDMV/PGS"       , CODEC_ID_HDMV_PGS_SUBTITLE},
+ 
+     {"V_DIRAC"          , CODEC_ID_DIRAC},
+-- 
+1.7.10
+
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch
deleted file mode 100644
index b780d72a55..0000000000
--- a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.6-911-add-S_DVBSUB-to-list-of-codecs-in-mkv-containers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libavformat/matroska.c	2012-07-07 03:11:59.514972002 -0700
-+++ b/libavformat/matroska.c	2012-07-07 03:12:49.054969249 -0700
-@@ -59,6 +59,7 @@
-     {"S_ASS"            , CODEC_ID_SSA},
-     {"S_SSA"            , CODEC_ID_SSA},
-     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
-+    {"S_DVBSUB"         , CODEC_ID_DVB_SUBTITLE},
-     {"S_HDMV/PGS"       , CODEC_ID_HDMV_PGS_SUBTITLE},
- 
-     {"V_DIRAC"          , CODEC_ID_DIRAC},