diff --git a/.gitignore b/.gitignore
index 2eee0eb..0154cf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 Blue-1.7.tar.bz2
 mplayer-export-2011-01-10.tar.bz2
 mplayer-export-2011-02-27.tar.bz2
+mplayer-export-2011-04-04.tar.bz2
+mplayer-export-2011-04-12.tar.bz2
diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch
index 8d2539d..a191c2f 100644
--- a/mplayer-ffmpeg.patch
+++ b/mplayer-ffmpeg.patch
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2011-02-27/configure.ffmpeg mplayer-export-2011-02-27/configure
---- mplayer-export-2011-02-27/configure.ffmpeg	2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/configure	2011-03-23 19:42:40.000000000 +0100
-@@ -6887,7 +6887,8 @@ elif test "$ffmpeg_so" = auto ; then
+diff -up mplayer-export-2011-04-12/configure.ffmpeg mplayer-export-2011-04-12/configure
+--- mplayer-export-2011-04-12/configure.ffmpeg	2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/configure	2011-04-12 17:18:33.000000000 +0200
+@@ -6888,7 +6888,8 @@ elif test "$ffmpeg_so" = auto ; then
      inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
      _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
      header_check libavutil/avutil.h $inc_ffmpeg $_ld_tmp &&
@@ -11,7 +11,7 @@ diff -up mplayer-export-2011-02-27/configure.ffmpeg mplayer-export-2011-02-27/co
    elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then
      extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
      ffmpeg_so=yes
-@@ -7574,7 +7575,7 @@ if test "$_gui" = yes ; then
+@@ -7593,7 +7594,7 @@ if test "$_gui" = yes ; then
  
    # Required libraries
    if test "$ffmpeg" != yes ||
@@ -20,9 +20,9 @@ diff -up mplayer-export-2011-02-27/configure.ffmpeg mplayer-export-2011-02-27/co
      die "The GUI requires libavcodec with PNG support (needs zlib)."
    fi
    test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h
---- mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg	2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h	2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h
+--- mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h.ffmpeg	2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h	2011-04-12 17:18:33.000000000 +0200
 @@ -0,0 +1,41 @@
 +/*
 + * RIFF codec tags
@@ -65,9 +65,9 @@ diff -up mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg mplayer-expo
 +extern const AVCodecTag ff_codec_wav_tags[];
 +
 +#endif /* AVFORMAT_RIFF_H */
-diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h
---- mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg	2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h	2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h
+--- mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h.ffmpeg	2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h	2011-04-12 17:18:33.000000000 +0200
 @@ -0,0 +1,47 @@
 +/*
 + * copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
@@ -116,9 +116,9 @@ diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-
 +void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
 +
 +#endif /* AVUTIL_AES_H */
-diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h
---- mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg	2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h	2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h
+--- mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h.ffmpeg	2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h	2011-04-12 17:18:33.000000000 +0200
 @@ -0,0 +1,56 @@
 +/*
 + * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
@@ -176,9 +176,9 @@ diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-
 +void av_sha_final(struct AVSHA* context, uint8_t *digest);
 +
 +#endif /* AVUTIL_SHA_H */
-diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg	2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h	2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h.ffmpeg	2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h	2011-04-12 17:18:33.000000000 +0200
 @@ -0,0 +1,98 @@
 +/*
 + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
@@ -278,25 +278,10 @@ diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-exp
 +#endif
 +
 +#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg mplayer-export-2011-02-27/libmpcodecs/vf_pp.c
---- mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg	2011-02-04 11:01:46.000000000 +0100
-+++ mplayer-export-2011-02-27/libmpcodecs/vf_pp.c	2011-03-23 19:39:17.000000000 +0100
-@@ -34,10 +34,10 @@
- #include "img_format.h"
- #include "mp_image.h"
- #include "vf.h"
--#include "libavutil/internal.h"
- #include "libpostproc/postprocess.h"
- 
- #ifdef CONFIG_FFMPEG_A
-+#include "libavutil/internal.h"
- #define EMU_OLD
- #include "libpostproc/postprocess_internal.h"
- #endif
-diff -up mplayer-export-2011-02-27/Makefile.ffmpeg mplayer-export-2011-02-27/Makefile
---- mplayer-export-2011-02-27/Makefile.ffmpeg	2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/Makefile	2011-03-23 19:39:17.000000000 +0100
-@@ -808,7 +808,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2011-04-12/Makefile.ffmpeg mplayer-export-2011-04-12/Makefile
+--- mplayer-export-2011-04-12/Makefile.ffmpeg	2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/Makefile	2011-04-12 17:18:33.000000000 +0200
+@@ -809,7 +809,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
  	$(CC) -o $@ $^ $(EXTRALIBS)
  
  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
diff --git a/mplayer-libvorbis.patch b/mplayer-libvorbis.patch
deleted file mode 100644
index 6f44946..0000000
--- a/mplayer-libvorbis.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -up mplayer-export-2010-12-04/configure.libvorbis mplayer-export-2010-12-04/configure
---- mplayer-export-2010-12-04/configure.libvorbis	2010-12-05 00:14:13.000000000 +0100
-+++ mplayer-export-2010-12-04/configure	2010-12-05 00:16:53.000000000 +0100
-@@ -659,6 +659,7 @@ _tremor=auto
- _tremor_internal=yes
- _tremor_low=no
- _libvorbis=auto
-+_libvorbisenc=auto
- _speex=auto
- _libgsm=auto
- _theora=auto
-@@ -6315,7 +6316,7 @@ if test "$_toolamedir" ; then
- fi
- echores "$_toolame"
- 
--echocheck "OggVorbis support"
-+echocheck "OggVorbis decoding support"
- if test "$_tremor_internal" = yes; then
-   _libvorbis=no
- elif test "$_tremor" = auto; then
-@@ -6328,6 +6329,7 @@ if test "$_libvorbis" = auto; then
- fi
- if test "$_tremor_internal" = yes ; then
-   _vorbis=yes
-+  def_libvorbis='#define CONFIG_LIBVORBIS 0'
-   def_vorbis='#define CONFIG_OGGVORBIS 1'
-   def_tremor='#define CONFIG_TREMOR 1'
-   codecmodules="tremor(internal) $codecmodules"
-@@ -6338,6 +6340,7 @@ if test "$_tremor_internal" = yes ; then
-   fi
- elif test "$_tremor" = yes ; then
-   _vorbis=yes
-+  def_libvorbis='#define CONFIG_LIBVORBIS 0'
-   def_vorbis='#define CONFIG_OGGVORBIS 1'
-   def_tremor='#define CONFIG_TREMOR 1'
-   codecmodules="tremor(external) $codecmodules"
-@@ -6345,17 +6348,32 @@ elif test "$_tremor" = yes ; then
-   extra_ldflags="$extra_ldflags -logg -lvorbisidec"
- elif test "$_libvorbis" = yes ; then
-   _vorbis=yes
-+  def_libvorbis='#define CONFIG_LIBVORBIS 1'
-   def_vorbis='#define CONFIG_OGGVORBIS 1'
-   codecmodules="libvorbis $codecmodules"
-   res_comment="libvorbis"
-   extra_ldflags="$extra_ldflags -lvorbis -logg"
--  libavencoders="$libavencoders LIBVORBIS_ENCODER"
- else
-   _vorbis=no
-   nocodecmodules="libvorbis $nocodecmodules"
- fi
- echores "$_vorbis"
- 
-+echocheck "OggVorbis encoding support"
-+if test "$_libvorbisenc" = auto; then
-+  _libvorbisenc=no
-+  statement_check vorbis/vorbisenc.h 'vorbis_encode_init(NULL, 0, 0, 0, 0, 0)' -lvorbisenc -lvorbis -logg $_ld_lm && _libvorbisenc=yes
-+fi
-+if test "$_libvorbisenc" = yes ; then
-+  _vorbisenc=yes
-+  res_comment="libvorbisenc"
-+  extra_ldflags="$extra_ldflags -lvorbisenc -lvorbis -logg"
-+  libavencoders="$libavencoders LIBVORBIS_ENCODER"
-+else
-+  _vorbisenc=no
-+fi
-+echores "$_vorbisenc"
-+
- echocheck "libspeex (version >= 1.1 required)"
- if test "$_speex" = auto ; then
-   _speex=no
-@@ -8725,7 +8743,7 @@ $def_yasm
- #define CONFIG_FFSERVER 0
- #define CONFIG_GPL 1
- #define CONFIG_GRAY 0
--#define CONFIG_LIBVORBIS 0
-+$def_libvorbis
- #define CONFIG_POWERPC_PERF 0
- #define CONFIG_SHARED 0
- #define CONFIG_SMALL 0
diff --git a/mplayer.spec b/mplayer.spec
index dbbca82..4a2b95a 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -1,12 +1,12 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20110227svn
+%define         pre 20110412svn
 %define         svn 1
-%define         svnbuild 2011-02-27
+%define         svnbuild 2011-04-12
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
 Version:        1.0
-Release:        0.122.%{pre}%{?dist}
+Release:        0.123.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
@@ -24,10 +24,13 @@ Source0:        http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre
 %endif
 Source1:        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
 Source10:       mplayer-snapshot.sh
+# set defaults for Fedora
 Patch2:         %{name}-config.patch
+# use roff include statements instead of symlinks
 Patch8:         %{name}-manlinks.patch
+# erase any trace of libdvdcss
 Patch14:        %{name}-nodvdcss.patch
-Patch17:        %{name}-libvorbis.patch
+# use system FFmpeg libraries
 Patch18:        %{name}-ffmpeg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,7 +44,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  em8300-devel
 BuildRequires:  enca-devel
 BuildRequires:  faad2-devel >= %{faad2min}
-BuildRequires:  ffmpeg-devel
+BuildRequires:  ffmpeg-devel >= 0.6.90-0.1.rc0
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel >= 2.0.9
 BuildRequires:  fribidi-devel
@@ -214,6 +217,7 @@ This package contains various scripts from MPlayer TOOLS directory.
     %{!?_with_esound:--disable-esd} \\\
     %{!?_with_jack:--disable-jack} \\\
     %{!?_with_openal:--disable-openal} \\\
+    --disable-mp3lib \\\
 
 
 %prep
@@ -225,7 +229,6 @@ This package contains various scripts from MPlayer TOOLS directory.
 %patch2 -p1 -b .config
 %patch8 -p1 -b .manlinks
 %patch14 -p1 -b .nodvdcss
-%patch17 -p1 -b .libvorbis
 %patch18 -p1 -b .ffmpeg
 
 doconv() {
@@ -399,6 +402,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mplayer/*.fp
 
 %changelog
+* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.123.20110412svn
+- 20110412 snapshot
+- drop obsolete libvorbis patch
+- add explanatory comments to all patches
+- temporarily disable mp3lib decoder (workaround for bug #1680)
+
 * Sun Mar 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.122.20110227svn
 - 20110227 snapshot
 - rebuilt for new ffmpeg and x264
diff --git a/sources b/sources
index 90f1e66..63c2e07 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 e4e2020d11b681aac898103b3ba723c4  Blue-1.7.tar.bz2
-d1c8316979ec850a8b345a08775739e7  mplayer-export-2011-01-10.tar.bz2
-98d92317fbadd65a404c1a1524fa6ad3  mplayer-export-2011-02-27.tar.bz2
+8d56ef3c6200b81e1b9b6824afb2fba2  mplayer-export-2011-04-12.tar.bz2