diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta
index af8149e71e..54368e6df2 100644
--- a/packages/multimedia/ffmpeg/meta
+++ b/packages/multimedia/ffmpeg/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="ffmpeg"
-PKG_VERSION="0.10.3"
+PKG_VERSION="0.10.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0027-threads-Perform-the-generic-progress-cleanup-more-ca.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0027-threads-Perform-the-generic-progress-cleanup-more-ca.patch
deleted file mode 100644
index 311bef4ce7..0000000000
--- a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0027-threads-Perform-the-generic-progress-cleanup-more-ca.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 05f8b5549c5e20cf9a417069838edd6841d7bd40 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michaelni@gmx.at>
-Date: Sat, 11 Feb 2012 20:14:33 +0100
-Subject: [PATCH 1/1] threads: Perform the generic progress cleanup more
- carefully.
-
-The cleanup is only done now when
-a picture is returned (assuming that it has to be done when its returned)
-a error is returned (assuming that there will be no further progress on the frame)
-the codec is not h264 (this is still needed due to some deadlocks in realvideo)
-
-This fixes a decoding regression with 00017.MTS
-
-Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
----
- libavcodec/pthread.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
-index 6ae763d..c58222b 100644
---- a/libavcodec/pthread.c
-+++ b/libavcodec/pthread.c
-@@ -390,7 +390,7 @@ static attribute_align_arg void *frame_worker_thread(void *arg)
- 
-         pthread_mutex_lock(&p->progress_mutex);
-         for (i = 0; i < MAX_BUFFERS; i++)
--            if (p->progress_used[i]) {
-+            if (p->progress_used[i] && (p->got_frame || p->result<0 || avctx->codec_id != CODEC_ID_H264)) {
-                 p->progress[i][0] = INT_MAX;
-                 p->progress[i][1] = INT_MAX;
-             }
--- 
-1.7.9.4
-
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0001-Support-raw-dvdsub-palette-as-stored-on-normal-dvd-s.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0002-Change-fallthrough-logic-for-read_seek-to-be-based-o.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0003-matroska-Check-return-value-of-avio_seek-and-avoid-m.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0004-asf-hacks.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0004-asf-hacks.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0004-asf-hacks.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0004-asf-hacks.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0005-if-av_read_packet-returns-AVERROR_IO-we-are-done.-ff.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0006-added-Ticket-7187-TV-Teletext-support-for-DVB-EBU-Te.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0007-Don-t-accept-mpegts-PMT-that-isn-t-current.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0008-Don-t-reparse-PMT-unless-it-s-version-has-changed.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0009-fixed-compile-with-VDPAU-header-versions-without-MPE.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0010-Read-PID-timestamps-as-well-as-PCR-timestamps-to-fin.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0011-Get-stream-durations-using-read_timestamp.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0011-Get-stream-durations-using-read_timestamp.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0011-Get-stream-durations-using-read_timestamp.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0011-Get-stream-durations-using-read_timestamp.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0012-include-stdint.h.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0012-include-stdint.h.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0012-include-stdint.h.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0012-include-stdint.h.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0013-aacenc-add-recognized-profiles-array.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0013-aacenc-add-recognized-profiles-array.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0013-aacenc-add-recognized-profiles-array.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0013-aacenc-add-recognized-profiles-array.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0014-changed-allow-8-second-skew-between-streams-in-mov-b.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0015-fixed-memleak-in-mpegts-demuxer-on-some-malformed-mp.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0016-Speed-up-mpegts-av_find_stream_info.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0016-Speed-up-mpegts-av_find_stream_info.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0016-Speed-up-mpegts-av_find_stream_info.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0016-Speed-up-mpegts-av_find_stream_info.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0017-allow-customizing-shared-library-soname-name-with-ma.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0017-allow-customizing-shared-library-soname-name-with-ma.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0017-allow-customizing-shared-library-soname-name-with-ma.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0017-allow-customizing-shared-library-soname-name-with-ma.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0018-dxva-mpeg2-Allocate-slices-array-dynamically-fixes-v.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0019-dxva-mpeg2-speed-up-slice-allocation.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0019-dxva-mpeg2-speed-up-slice-allocation.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0019-dxva-mpeg2-speed-up-slice-allocation.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0019-dxva-mpeg2-speed-up-slice-allocation.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0020-dxva-vc1-Take-BI-into-account-for-forward-and-backwa.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0021-dxva-vc1-Pass-overlapping-transforms-hint.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0022-dxva-h264-Fix-dxva-playback-of-streams-that-don-t-st.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0023-Changed-format-string-td-not-supported-by-our-MingW-.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0024-add-public-version-of-ff_read_frame_flush.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0024-add-public-version-of-ff_read_frame_flush.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0024-add-public-version-of-ff_read_frame_flush.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0024-add-public-version-of-ff_read_frame_flush.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0025-dvb-subtitle-decoding-when-display-segment-is-mi.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0026-Handle-return-value-of-BeginFrame-better.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0026-Handle-return-value-of-BeginFrame-better.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0026-Handle-return-value-of-BeginFrame-better.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0026-Handle-return-value-of-BeginFrame-better.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0028-fixed-dvd-still-frames-ended-up-in-internal-lavf.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0029-stop-forcing-gas-preprocessor-for-darwin.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0029-stop-forcing-gas-preprocessor-for-darwin.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-0029-stop-forcing-gas-preprocessor-for-darwin.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-0029-stop-forcing-gas-preprocessor-for-darwin.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-901.01-add_xvba_support.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.01-add_xvba_support.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-901.01-add_xvba_support.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.01-add_xvba_support.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.02-xvba_adapt_to_new_ffmpeg_fix_artifacts_for_h.264.patch
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-901.03-xvba_xvba_vc-1_new_ffmpeg.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.03-xvba_xvba_vc-1_new_ffmpeg.patch
similarity index 100%
rename from packages/multimedia/ffmpeg/patches/ffmpeg-0.10.3-901.03-xvba_xvba_vc-1_new_ffmpeg.patch
rename to packages/multimedia/ffmpeg/patches/ffmpeg-0.10.4-901.03-xvba_xvba_vc-1_new_ffmpeg.patch
diff --git a/packages/multimedia/ffmpeg/patches/rename.sh b/packages/multimedia/ffmpeg/patches/rename.sh
new file mode 100755
index 0000000000..c0b64b5bd9
--- /dev/null
+++ b/packages/multimedia/ffmpeg/patches/rename.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+
+for i in `ls ffmpeg-$1-*.patch`; do
+  mv $i `echo $i | sed "s,$1,$2,g"`
+done