diff --git a/package/public/ffmpeg/compile.patch b/package/public/ffmpeg/compile.patch
index c77029be7..0617b425f 100644
--- a/package/public/ffmpeg/compile.patch
+++ b/package/public/ffmpeg/compile.patch
@@ -27,6 +27,6 @@ diff -ruN ffmpeg-0.4.9-pre1/Makefile ffmpeg-0.4.9-pre1-new/Makefile
 +# ReneR: well the maintainer could also test his ... without imlib2 support
 +EXTRALIBS+=-L/usr/X11/lib -lX11
 +
- MANPAGE=$(SRC_PATH)/doc/ffmpeg.1
+ MANPAGE=doc/ffmpeg.1
  PROG=ffmpeg$(EXESUF)
  PROGTEST=output_example$(EXESUF)
diff --git a/package/public/ffmpeg/ffmpeg.conf b/package/public/ffmpeg/ffmpeg.conf
index 025518dce..a8eef627f 100644
--- a/package/public/ffmpeg/ffmpeg.conf
+++ b/package/public/ffmpeg/ffmpeg.conf
@@ -22,8 +22,15 @@
 
 # fill options the configure does not attempt to detect ...
 pkginstalled lame && var_append extraconfopt " " "--enable-mp3lame"
-pkginstalled ogg-vorbis && var_append extraconfopt " " "--enable-vorbis" 
+pkginstalled ogg-vorbis && var_append extraconfopt " " "--enable-libogg --enable-vorbis"
+pkginstalled libtheora && var_append extraconfopt " " "--enable-theora"
+pkginstalled faad2 && var_append extraconfopt " " "--enable-faad --enable-faadbin"
+pkginstalled faac && var_append extraconfopt " " "--enable-faac"
+pkginstalled gsm && var_append extraconfopt " " "--enable-libgsm"
+pkginstalled xvid && var_append extraconfopt " " "--enable-xvid"
+pkginstalled x264 && var_append extraconfopt " " "--enable-x264"
+pkginstalled libdca && var_append extraconfopt " " "--enable-dts"
 pkginstalled a52dec && var_append extraconfopt " " "--enable-a52"
 
-var_append confopt " " "--enable-shared --enable-pp --enable-gpl"
+var_append confopt " " "--enable-shared --enable-pp --enable-gpl --enable-pthreads"
 
diff --git a/package/public/ffmpeg/ffmpeg.desc b/package/public/ffmpeg/ffmpeg.desc
index cfc0e99e8..6049a779a 100644
--- a/package/public/ffmpeg/ffmpeg.desc
+++ b/package/public/ffmpeg/ffmpeg.desc
@@ -34,9 +34,10 @@
 [C] extra/multimedia
 
 [L] LGPL
-[S] Stable
-[V] 0.4.9-pre1
+[S] Beta
+[V] 2005-10-21
 [P] X -?---5---9 141.600
 
-[D] 2478774124 ffmpeg-0.4.9-pre1.tar.gz http://dl.sourceforge.net/sourceforge/ffmpeg/
+[D] X ffmpeg-2005-10-21 cvs://pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg::ffmpeg/!2005-10-21/
+
 
diff --git a/package/public/ffmpeg/gcc34.patch b/package/public/ffmpeg/gcc34.patch
deleted file mode 100644
index cefce1136..000000000
--- a/package/public/ffmpeg/gcc34.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/rene/ffmpeg/gcc34.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -ruN ffmpeg-0.4.9-pre1/libavcodec/liba52/resample_mmx.c ffmpeg-0.4.9-pre1-patch/libavcodec/liba52/resample_mmx.c
---- ffmpeg-0.4.9-pre1/libavcodec/liba52/resample_mmx.c	2003-04-16 22:03:07.000000000 +0200
-+++ ffmpeg-0.4.9-pre1-patch/libavcodec/liba52/resample_mmx.c	2004-07-21 08:35:46.066975912 +0200
-@@ -7,10 +7,10 @@
- 	and it would mean (C / MMX2 / MMX / 3DNOW) versions 
- */
- 
--static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
--static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
--static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
--static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
-+static uint64_t magicF2W attribute_used __attribute__((aligned(8))) = 0x43c0000043c00000LL;
-+static uint64_t wm1010   attribute_used __attribute__((aligned(8))) = 0xFFFF0000FFFF0000LL;
-+static uint64_t wm0101   attribute_used __attribute__((aligned(8))) = 0x0000FFFF0000FFFFLL;
-+static uint64_t wm1100   attribute_used __attribute__((aligned(8))) = 0xFFFFFFFF00000000LL;
- 
- static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
-     int32_t * f = (int32_t *) _f;