Update mplayer packages to 1.1, provided by Leonardo Taccari in PR 46566.

Pkgsrc changes:
* Fix some pkglint(1) warnings (no functional changes intended)
* Modified options.mk in order to always enable or disable a
  PKG_SUPPORTED_OPTION (for more information please give a look to
  the second "Note" of options.mk)
* Removed the mplayer-internal-faad PKG_SUPPORTED_OPTION, now faad support is
  only enabled via audio/faad2.
* Changed MASTER_SITES, now MPlayer distfile is fetched directly from its
  mirror.

MPlayer changes:

  1.1: "We gave up on 1.0"

    Decoders:
    * FFmpeg AAC decoder is now preferred over libfaad2 and the internal
      libfaad2 forked copy has been removed in its favor

    Demuxers:
    * experimental support for using binary Quicktime codecs with -demuxer lavf.
    * correct runtime and average bitrate for VBR (variable bitrate) MP3

    Filters:
    * delogo: allow to change the rectangle based on the time.
    * lavfi: libavfilter filter graphs (experimental).

    Other:
    * support adding noise at output resolution with -vo gl:noise-strength=8
    * experimental support for OpenGL ES 1.0 in -vo gl
    * support for PGS (BluRay-compatible), DVB and XSUB subtitles.
    * af_cmdline slave command to change e.g. audio equalizer options at runtime.
    * vo x11: don't hide or show cursor any more if attached to an existing window (-wid)
    * try reconnecting network streams e.g. after network timeouts
    * lots of bug fixes as always (and surely a few new bugs, too :-( )

    GUI: Support for the GUI continues.
    * numerous fixes, improvements and updates
    * UTF-8 support
    * all skin messages available as slave commands (gui <message>)
    * fancy new icon

    Ports:
    * Wine (see DOCS/tech/crosscompile.txt)

    MEncoder:
    * -force-key-frames option to set explicit seek points.

MPlayer (1.0)

  rc4: "Yes We Can"

    GUI: Changes towards removing the GUI
    * The GUI will no longer display any error or warning messages.
    * Special GUI slave commands (gui_*) were removed, along with
      the related key bindings.

    Decoders:
    * YUY2 Lossless Codec (YLC0) via binary DLL
    * Truemotion RT codec (TR20) via binary DLL
    * Nogantech Codec (NTN1 and NTN2) via binary DLL
    * add new FourCCs (m1v1, yuvs, VYUY, Y42B, V422, YUNV, UYNV, UYNY, uyv1,
      2Vu1, P422, HDYC, IJLV, MVJP)
      TwoCCs (0xA106, 0x6c75, 0xAAC0, 0x55005354)
      to existing decoders
    * AMR now handled via OpenCORE decoder
    * updated Windows Media Screen Codec (MSS1, MSS2) via binary DLL
    * CoreAVC H.264 decoder via binary DLL (Windows only)
    * Kega Game video codec (KGV1) via binary DLL
    * SoftLab-NSK Forward MPEG-2 I-frames (SLIF) via binary DLL
    * JPEG 2000 support via OpenJPEG
    * internal liba52 copy removed
    * CineForm HD (CFHD) via binary DLL
    * VP8 en-/decoding through libvpx wrapper and native decoder in FFmpeg
    * support for external libmpeg2 added
    * hardware MPEG decoder priority lowered
    * external libmpg123 support

    Demuxers:
    * Mostly fixed timing issues with some H.264 (PAFF) samples
    * Matroska and Ogg demuxers switched to use libavformat by default.
      Report issues and use -demuxer ogg and -demuxer mkv to work around them.
    * support for TrueHD in Blu-ray streams in libmpdemux
    * more Blu-ray codec support with lavf
    * fix length in ASF/WMV files
    * support ISDB-Tb DVB streams

    Filters:
    * remove vf_yuy2, functionality is replaced by -vf format=yuv2
    * remove vf_rgb2bgr, functionality is replaced by sws and vf_format

    Streaming:
    * Support for unencrypted Blu-ray playback through libbluray.
      Use it through: mplayer br:////path/to/disc

    Drivers:
    * -vo yuv4mpeg:interlaced no longer does its own interlaced RGB->YUV
      conversion. Use -vf scale=::1 to keep the same behavior and report
      if there are any issues with that.
    * X11: Window manager chooses Window position by default.
      Add geometry=50%:50% to your configuration to get the old behavior.
    * -vo md5sum md5 calculation changed so output matches FFmpeg's -f framemd5
    * Support for more formats in OpenGL video output drivers (different YUV
      subsampling, 16 bit per component)
    * Selectable YUV to RGB conversion standard for -vo gl
      (-vo gl:colorspace=...:levelconv=...)
    * -vo gl now tries to use yuv=2 by default if possible
    * -vo gl:stereo=... for experimental stereo (3D) support
    * -vo matrixview finally added
    * add OS/2 KAI audio driver (-ao kai)

    Other:
    * -nosub option for disabling auto-selected subtitles
    * support for displaying subs in the terminal (FIXME)
    * support for subtitles with audio-only files
    * support for right-to-left languages with embedded subtitles
    * support for UTF-16 encoded external subtitles
    * support for 8 channel audio
    * sync dvd:// and dvdnav:// features
    * support for MPEG-4 ASP in VDPAU video output (non-B-frame only)
    * support for live and non-live DVB teletext with demuxer lavf
    * -name, -title and -use-filename-title options for MPlayer
    * support for stream handling via FFmpeg, in particular RTMP and RTSP
      (use e.g. ffmpeg://http://example.com/test)
    * experimental support for external libass, configure with
      --disable-ass-internal
    * better support for 16-bit-per-component formats and formats
      with alpha channel
    * better out-of-the-box support for compiling for ARM, IA64,
      MinGW32 and MinGW-w64, MinGW has ASLR enabled with recent
      enough binutils
    * libdvdcss synced with upstream Subversion snapshot

    MEncoder:
    * add -tsprog for demuxer lavf

18 files changed, 970 insertions, 362 deletions

diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile
index 468463bee1a..60e93f890dd 100644
--- a/multimedia/mplayer-share/Makefile
+++ b/multimedia/mplayer-share/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2012/03/03 12:54:20 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/06/11 13:41:12 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
 PKGNAME=	mplayer-share-${MPLAYER_VERSION}
-PKGREVISION=	8
 COMMENT=	Documentation used by mplayer and gmplayer
 
 DEPENDS+=	mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
@@ -21,7 +20,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${DESTDIR}${PREFIX}/share/mplayer
 	${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${DESTDIR}${PREFIX}/share/mplayer
-	(cd ${WRKSRC}/DOCS && \
+	(set -e; cd ${WRKSRC}/DOCS && \
 		pax -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/DOCS); \
 	${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type d -print | \
 		${XARGS} ${CHMOD} ${PKGDIRMODE}
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index ff800708f43..d77a0db6b0e 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile.common,v 1.50 2012/05/04 16:29:14 joerg Exp $
+# $NetBSD: Makefile.common,v 1.51 2012/06/11 13:41:12 wiz Exp $
 # used by multimedia/gmplayer/Makefile
 # used by multimedia/mencoder/Makefile
 # used by multimedia/mplayer/Makefile
 
-MPLAYER_SNAPSHOT_DATE=	2010-09-13
-MPLAYER_VERSION=	1.0rc${MPLAYER_SNAPSHOT_DATE:S/-//g}
+MPLAYER_VERSION=	1.1
 
-DISTNAME=		mplayer-${MPLAYER_SNAPSHOT_DATE:S/-//g}
+DISTNAME=		MPlayer-${MPLAYER_VERSION}
 
 CATEGORIES?=		multimedia
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=commondistfiles/}
+MASTER_SITES=		http://www.mplayerhq.hu/MPlayer/releases/
 
-EXTRACT_SUFX=		.tar.bz2
 DIST_SUBDIR=		mplayer
 
-WRKSRC=			${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
-
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.mplayerhq.hu/
 
@@ -41,21 +37,21 @@ HAS_CONFIGURE=		YES
 
 PTHREAD_OPTS+=		require
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q} \
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			#--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
-			--with-extralibdir="${LOCALBASE}/lib" \
+			--with-extralibdir=${LOCALBASE}/lib \
 			--disable-dvdread-internal --disable-smb
 
 # The configure script attempts to test-execute compiled programs in /tmp,
 # but that directory may be mounted as noexec; work this around by setting
 # TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+=		TMPDIR=${WRKDIR:Q}
+CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
 # The configure script misdetects endianness on mipseb
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "mipseb"
-CONFIGURE_ARGS+=        --enable-big-endian
+CONFIGURE_ARGS+=	--enable-big-endian
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-arm)
@@ -70,13 +66,7 @@ SUBST_SED.arm_bswap=		-e s,\"arm/bswap.h\",\"arm/avbswap.h\",g
 SUBST_MESSAGE.arm_bswap=	Fixing "arm/bswap.h" conflict in libavutil
 
 # autodetect code enables these options on NetBSD/arm but it should not
-CONFIGURE_ARGS+=        --disable-armv5te --disable-armv6 --disable-armv6t2
-.endif
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+=	-no-integrated-as
+CONFIGURE_ARGS+=	--disable-armv5te --disable-armv6 --disable-armv6t2
 .endif
 
 .include "../../multimedia/mplayer-share/options.mk"
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
index f7afab1cc61..755f385eb15 100644
--- a/multimedia/mplayer-share/PLIST
+++ b/multimedia/mplayer-share/PLIST
@@ -1,5 +1,841 @@
-@comment $NetBSD: PLIST,v 1.12 2010/09/16 18:56:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/06/11 13:41:12 wiz Exp $
 man/man1/mplayer.1
+share/mplayer/DOCS/HTML/cs/aalib.html
+share/mplayer/DOCS/HTML/cs/advaudio.html
+share/mplayer/DOCS/HTML/cs/aspect.html
+share/mplayer/DOCS/HTML/cs/bsd.html
+share/mplayer/DOCS/HTML/cs/bugreports.html
+share/mplayer/DOCS/HTML/cs/bugreports_advusers.html
+share/mplayer/DOCS/HTML/cs/bugreports_fix.html
+share/mplayer/DOCS/HTML/cs/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/cs/bugreports_report.html
+share/mplayer/DOCS/HTML/cs/bugreports_security.html
+share/mplayer/DOCS/HTML/cs/bugreports_what.html
+share/mplayer/DOCS/HTML/cs/bugreports_where.html
+share/mplayer/DOCS/HTML/cs/caca.html
+share/mplayer/DOCS/HTML/cs/codec-installation.html
+share/mplayer/DOCS/HTML/cs/commandline.html
+share/mplayer/DOCS/HTML/cs/control.html
+share/mplayer/DOCS/HTML/cs/default.css
+share/mplayer/DOCS/HTML/cs/dfbmga.html
+share/mplayer/DOCS/HTML/cs/dga.html
+share/mplayer/DOCS/HTML/cs/directfb.html
+share/mplayer/DOCS/HTML/cs/drives.html
+share/mplayer/DOCS/HTML/cs/dummy.html
+share/mplayer/DOCS/HTML/cs/dvd.html
+share/mplayer/DOCS/HTML/cs/edl.html
+share/mplayer/DOCS/HTML/cs/encoding-guide.html
+share/mplayer/DOCS/HTML/cs/faq.html
+share/mplayer/DOCS/HTML/cs/fbdev.html
+share/mplayer/DOCS/HTML/cs/features.html
+share/mplayer/DOCS/HTML/cs/fonts-osd.html
+share/mplayer/DOCS/HTML/cs/gui.html
+share/mplayer/DOCS/HTML/cs/howtoread.html
+share/mplayer/DOCS/HTML/cs/index.html
+share/mplayer/DOCS/HTML/cs/install.html
+share/mplayer/DOCS/HTML/cs/intro.html
+share/mplayer/DOCS/HTML/cs/linux.html
+share/mplayer/DOCS/HTML/cs/macos.html
+share/mplayer/DOCS/HTML/cs/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/cs/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/cs/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/cs/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/cs/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/cs/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/cs/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/cs/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/cs/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/cs/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/cs/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/cs/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/cs/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/cs/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/cs/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/cs/menc-feat-x264.html
+share/mplayer/DOCS/HTML/cs/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/cs/mencoder.html
+share/mplayer/DOCS/HTML/cs/mga_vid.html
+share/mplayer/DOCS/HTML/cs/mpeg_decoders.html
+share/mplayer/DOCS/HTML/cs/mtrr.html
+share/mplayer/DOCS/HTML/cs/opengl.html
+share/mplayer/DOCS/HTML/cs/other.html
+share/mplayer/DOCS/HTML/cs/ports.html
+share/mplayer/DOCS/HTML/cs/radio.html
+share/mplayer/DOCS/HTML/cs/rtc.html
+share/mplayer/DOCS/HTML/cs/sdl.html
+share/mplayer/DOCS/HTML/cs/skin-file.html
+share/mplayer/DOCS/HTML/cs/skin-fonts.html
+share/mplayer/DOCS/HTML/cs/skin-gui.html
+share/mplayer/DOCS/HTML/cs/skin-overview.html
+share/mplayer/DOCS/HTML/cs/skin-quality.html
+share/mplayer/DOCS/HTML/cs/skin.html
+share/mplayer/DOCS/HTML/cs/softreq.html
+share/mplayer/DOCS/HTML/cs/streaming.html
+share/mplayer/DOCS/HTML/cs/subosd.html
+share/mplayer/DOCS/HTML/cs/svgalib.html
+share/mplayer/DOCS/HTML/cs/tdfx_vid.html
+share/mplayer/DOCS/HTML/cs/tdfxfb.html
+share/mplayer/DOCS/HTML/cs/tv-input.html
+share/mplayer/DOCS/HTML/cs/tvout.html
+share/mplayer/DOCS/HTML/cs/unix.html
+share/mplayer/DOCS/HTML/cs/usage.html
+share/mplayer/DOCS/HTML/cs/vcd.html
+share/mplayer/DOCS/HTML/cs/vesa.html
+share/mplayer/DOCS/HTML/cs/video.html
+share/mplayer/DOCS/HTML/cs/vidix.html
+share/mplayer/DOCS/HTML/cs/windows.html
+share/mplayer/DOCS/HTML/cs/x11.html
+share/mplayer/DOCS/HTML/cs/xv.html
+share/mplayer/DOCS/HTML/de/aalib.html
+share/mplayer/DOCS/HTML/de/advaudio.html
+share/mplayer/DOCS/HTML/de/aspect.html
+share/mplayer/DOCS/HTML/de/bsd.html
+share/mplayer/DOCS/HTML/de/bugreports.html
+share/mplayer/DOCS/HTML/de/bugreports_advusers.html
+share/mplayer/DOCS/HTML/de/bugreports_fix.html
+share/mplayer/DOCS/HTML/de/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/de/bugreports_report.html
+share/mplayer/DOCS/HTML/de/bugreports_security.html
+share/mplayer/DOCS/HTML/de/bugreports_what.html
+share/mplayer/DOCS/HTML/de/bugreports_where.html
+share/mplayer/DOCS/HTML/de/caca.html
+share/mplayer/DOCS/HTML/de/codec-installation.html
+share/mplayer/DOCS/HTML/de/commandline.html
+share/mplayer/DOCS/HTML/de/control.html
+share/mplayer/DOCS/HTML/de/default.css
+share/mplayer/DOCS/HTML/de/dfbmga.html
+share/mplayer/DOCS/HTML/de/dga.html
+share/mplayer/DOCS/HTML/de/directfb.html
+share/mplayer/DOCS/HTML/de/drives.html
+share/mplayer/DOCS/HTML/de/dummy.html
+share/mplayer/DOCS/HTML/de/dvd.html
+share/mplayer/DOCS/HTML/de/edl.html
+share/mplayer/DOCS/HTML/de/encoding-guide.html
+share/mplayer/DOCS/HTML/de/faq.html
+share/mplayer/DOCS/HTML/de/fbdev.html
+share/mplayer/DOCS/HTML/de/features.html
+share/mplayer/DOCS/HTML/de/fonts-osd.html
+share/mplayer/DOCS/HTML/de/gui.html
+share/mplayer/DOCS/HTML/de/howtoread.html
+share/mplayer/DOCS/HTML/de/index.html
+share/mplayer/DOCS/HTML/de/install.html
+share/mplayer/DOCS/HTML/de/intro.html
+share/mplayer/DOCS/HTML/de/linux.html
+share/mplayer/DOCS/HTML/de/macos.html
+share/mplayer/DOCS/HTML/de/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/de/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/de/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/de/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/de/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/de/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/de/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/de/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/de/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/de/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/de/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/de/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/de/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/de/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/de/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/de/menc-feat-x264.html
+share/mplayer/DOCS/HTML/de/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/de/mencoder.html
+share/mplayer/DOCS/HTML/de/mga_vid.html
+share/mplayer/DOCS/HTML/de/mpeg_decoders.html
+share/mplayer/DOCS/HTML/de/mtrr.html
+share/mplayer/DOCS/HTML/de/opengl.html
+share/mplayer/DOCS/HTML/de/other.html
+share/mplayer/DOCS/HTML/de/ports.html
+share/mplayer/DOCS/HTML/de/radio.html
+share/mplayer/DOCS/HTML/de/rtc.html
+share/mplayer/DOCS/HTML/de/sdl.html
+share/mplayer/DOCS/HTML/de/skin-file.html
+share/mplayer/DOCS/HTML/de/skin-fonts.html
+share/mplayer/DOCS/HTML/de/skin-gui.html
+share/mplayer/DOCS/HTML/de/skin-overview.html
+share/mplayer/DOCS/HTML/de/skin-quality.html
+share/mplayer/DOCS/HTML/de/skin.html
+share/mplayer/DOCS/HTML/de/softreq.html
+share/mplayer/DOCS/HTML/de/streaming.html
+share/mplayer/DOCS/HTML/de/subosd.html
+share/mplayer/DOCS/HTML/de/svgalib.html
+share/mplayer/DOCS/HTML/de/tdfx_vid.html
+share/mplayer/DOCS/HTML/de/tdfxfb.html
+share/mplayer/DOCS/HTML/de/tv-input.html
+share/mplayer/DOCS/HTML/de/tv-teletext.html
+share/mplayer/DOCS/HTML/de/tvout.html
+share/mplayer/DOCS/HTML/de/unix.html
+share/mplayer/DOCS/HTML/de/usage.html
+share/mplayer/DOCS/HTML/de/vcd.html
+share/mplayer/DOCS/HTML/de/vesa.html
+share/mplayer/DOCS/HTML/de/video.html
+share/mplayer/DOCS/HTML/de/vidix.html
+share/mplayer/DOCS/HTML/de/windows.html
+share/mplayer/DOCS/HTML/de/x11.html
+share/mplayer/DOCS/HTML/de/xv.html
+share/mplayer/DOCS/HTML/en/aalib.html
+share/mplayer/DOCS/HTML/en/advaudio-channels.html
+share/mplayer/DOCS/HTML/en/advaudio-surround.html
+share/mplayer/DOCS/HTML/en/advaudio-volume.html
+share/mplayer/DOCS/HTML/en/aspect.html
+share/mplayer/DOCS/HTML/en/blinkenlights.html
+share/mplayer/DOCS/HTML/en/bsd.html
+share/mplayer/DOCS/HTML/en/bugreports.html
+share/mplayer/DOCS/HTML/en/bugreports_advusers.html
+share/mplayer/DOCS/HTML/en/bugreports_fix.html
+share/mplayer/DOCS/HTML/en/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/en/bugreports_report.html
+share/mplayer/DOCS/HTML/en/bugreports_security.html
+share/mplayer/DOCS/HTML/en/bugreports_what.html
+share/mplayer/DOCS/HTML/en/bugreports_where.html
+share/mplayer/DOCS/HTML/en/caca.html
+share/mplayer/DOCS/HTML/en/codec-installation.html
+share/mplayer/DOCS/HTML/en/commandline.html
+share/mplayer/DOCS/HTML/en/control.html
+share/mplayer/DOCS/HTML/en/default.css
+share/mplayer/DOCS/HTML/en/dfbmga.html
+share/mplayer/DOCS/HTML/en/dga.html
+share/mplayer/DOCS/HTML/en/directfb.html
+share/mplayer/DOCS/HTML/en/dummy.html
+share/mplayer/DOCS/HTML/en/dvd.html
+share/mplayer/DOCS/HTML/en/edl.html
+share/mplayer/DOCS/HTML/en/encoding-guide.html
+share/mplayer/DOCS/HTML/en/faq.html
+share/mplayer/DOCS/HTML/en/fbdev.html
+share/mplayer/DOCS/HTML/en/features.html
+share/mplayer/DOCS/HTML/en/fonts-osd.html
+share/mplayer/DOCS/HTML/en/gui.html
+share/mplayer/DOCS/HTML/en/howtoread.html
+share/mplayer/DOCS/HTML/en/index.html
+share/mplayer/DOCS/HTML/en/install.html
+share/mplayer/DOCS/HTML/en/intro.html
+share/mplayer/DOCS/HTML/en/linux.html
+share/mplayer/DOCS/HTML/en/macos.html
+share/mplayer/DOCS/HTML/en/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/en/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/en/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/en/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/en/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/en/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/en/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/en/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/en/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/en/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/en/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/en/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/en/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/en/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/en/menc-feat-x264.html
+share/mplayer/DOCS/HTML/en/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/en/mencoder.html
+share/mplayer/DOCS/HTML/en/mga_vid.html
+share/mplayer/DOCS/HTML/en/mpeg_decoders.html
+share/mplayer/DOCS/HTML/en/networksync.html
+share/mplayer/DOCS/HTML/en/opengl.html
+share/mplayer/DOCS/HTML/en/ports.html
+share/mplayer/DOCS/HTML/en/radio.html
+share/mplayer/DOCS/HTML/en/rtc.html
+share/mplayer/DOCS/HTML/en/skin-file.html
+share/mplayer/DOCS/HTML/en/skin-fonts.html
+share/mplayer/DOCS/HTML/en/skin-gui.html
+share/mplayer/DOCS/HTML/en/skin-overview.html
+share/mplayer/DOCS/HTML/en/skin-quality.html
+share/mplayer/DOCS/HTML/en/skin.html
+share/mplayer/DOCS/HTML/en/softreq.html
+share/mplayer/DOCS/HTML/en/streaming.html
+share/mplayer/DOCS/HTML/en/subosd.html
+share/mplayer/DOCS/HTML/en/svgalib.html
+share/mplayer/DOCS/HTML/en/tdfx_vid.html
+share/mplayer/DOCS/HTML/en/tdfxfb.html
+share/mplayer/DOCS/HTML/en/tv-input.html
+share/mplayer/DOCS/HTML/en/tv-teletext.html
+share/mplayer/DOCS/HTML/en/tvout.html
+share/mplayer/DOCS/HTML/en/unix.html
+share/mplayer/DOCS/HTML/en/usage.html
+share/mplayer/DOCS/HTML/en/vcd.html
+share/mplayer/DOCS/HTML/en/vesa.html
+share/mplayer/DOCS/HTML/en/video.html
+share/mplayer/DOCS/HTML/en/vidix.html
+share/mplayer/DOCS/HTML/en/windows.html
+share/mplayer/DOCS/HTML/en/x11.html
+share/mplayer/DOCS/HTML/en/xv.html
+share/mplayer/DOCS/HTML/en/zr.html
+share/mplayer/DOCS/HTML/es/aspect.html
+share/mplayer/DOCS/HTML/es/bsd.html
+share/mplayer/DOCS/HTML/es/bugreports.html
+share/mplayer/DOCS/HTML/es/bugreports_advusers.html
+share/mplayer/DOCS/HTML/es/bugreports_fix.html
+share/mplayer/DOCS/HTML/es/bugreports_report.html
+share/mplayer/DOCS/HTML/es/bugreports_what.html
+share/mplayer/DOCS/HTML/es/bugreports_where.html
+share/mplayer/DOCS/HTML/es/caracteristicas.html
+share/mplayer/DOCS/HTML/es/codec-installation.html
+share/mplayer/DOCS/HTML/es/commandline.html
+share/mplayer/DOCS/HTML/es/control.html
+share/mplayer/DOCS/HTML/es/default.css
+share/mplayer/DOCS/HTML/es/drives.html
+share/mplayer/DOCS/HTML/es/dummy.html
+share/mplayer/DOCS/HTML/es/dvd.html
+share/mplayer/DOCS/HTML/es/edl.html
+share/mplayer/DOCS/HTML/es/encoding-guide.html
+share/mplayer/DOCS/HTML/es/faq.html
+share/mplayer/DOCS/HTML/es/gui.html
+share/mplayer/DOCS/HTML/es/howtoread.html
+share/mplayer/DOCS/HTML/es/hpux.html
+share/mplayer/DOCS/HTML/es/index.html
+share/mplayer/DOCS/HTML/es/install.html
+share/mplayer/DOCS/HTML/es/intro.html
+share/mplayer/DOCS/HTML/es/linux.html
+share/mplayer/DOCS/HTML/es/macos.html
+share/mplayer/DOCS/HTML/es/menc-feat-divx4.html
+share/mplayer/DOCS/HTML/es/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/es/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/es/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/es/menc-feat-fix-avi.html
+share/mplayer/DOCS/HTML/es/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/es/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/es/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/es/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/es/mencoder.html
+share/mplayer/DOCS/HTML/es/mpeg_decoders.html
+share/mplayer/DOCS/HTML/es/mpst.html
+share/mplayer/DOCS/HTML/es/mtrr.html
+share/mplayer/DOCS/HTML/es/other.html
+share/mplayer/DOCS/HTML/es/output-trad.html
+share/mplayer/DOCS/HTML/es/ports.html
+share/mplayer/DOCS/HTML/es/qnx.html
+share/mplayer/DOCS/HTML/es/radio.html
+share/mplayer/DOCS/HTML/es/rtc.html
+share/mplayer/DOCS/HTML/es/skin-file.html
+share/mplayer/DOCS/HTML/es/skin-fonts.html
+share/mplayer/DOCS/HTML/es/skin-gui.html
+share/mplayer/DOCS/HTML/es/skin-overview.html
+share/mplayer/DOCS/HTML/es/skin.html
+share/mplayer/DOCS/HTML/es/softreq.html
+share/mplayer/DOCS/HTML/es/solaris.html
+share/mplayer/DOCS/HTML/es/streaming.html
+share/mplayer/DOCS/HTML/es/subosd.html
+share/mplayer/DOCS/HTML/es/tv-input.html
+share/mplayer/DOCS/HTML/es/tvout.html
+share/mplayer/DOCS/HTML/es/usage.html
+share/mplayer/DOCS/HTML/es/vcd.html
+share/mplayer/DOCS/HTML/es/video-dev.html
+share/mplayer/DOCS/HTML/es/windows.html
+share/mplayer/DOCS/HTML/fr/aalib.html
+share/mplayer/DOCS/HTML/fr/advaudio.html
+share/mplayer/DOCS/HTML/fr/aspect.html
+share/mplayer/DOCS/HTML/fr/bsd.html
+share/mplayer/DOCS/HTML/fr/bugreports.html
+share/mplayer/DOCS/HTML/fr/bugreports_advusers.html
+share/mplayer/DOCS/HTML/fr/bugreports_fix.html
+share/mplayer/DOCS/HTML/fr/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/fr/bugreports_report.html
+share/mplayer/DOCS/HTML/fr/bugreports_security.html
+share/mplayer/DOCS/HTML/fr/bugreports_what.html
+share/mplayer/DOCS/HTML/fr/bugreports_where.html
+share/mplayer/DOCS/HTML/fr/caca.html
+share/mplayer/DOCS/HTML/fr/codec-installation.html
+share/mplayer/DOCS/HTML/fr/commandline.html
+share/mplayer/DOCS/HTML/fr/control.html
+share/mplayer/DOCS/HTML/fr/default.css
+share/mplayer/DOCS/HTML/fr/dfbmga.html
+share/mplayer/DOCS/HTML/fr/dga.html
+share/mplayer/DOCS/HTML/fr/directfb.html
+share/mplayer/DOCS/HTML/fr/drives.html
+share/mplayer/DOCS/HTML/fr/dummy.html
+share/mplayer/DOCS/HTML/fr/dvd.html
+share/mplayer/DOCS/HTML/fr/edl.html
+share/mplayer/DOCS/HTML/fr/encoding-guide.html
+share/mplayer/DOCS/HTML/fr/faq.html
+share/mplayer/DOCS/HTML/fr/fbdev.html
+share/mplayer/DOCS/HTML/fr/features.html
+share/mplayer/DOCS/HTML/fr/fonts-osd.html
+share/mplayer/DOCS/HTML/fr/gui.html
+share/mplayer/DOCS/HTML/fr/howtoread.html
+share/mplayer/DOCS/HTML/fr/index.html
+share/mplayer/DOCS/HTML/fr/install.html
+share/mplayer/DOCS/HTML/fr/intro.html
+share/mplayer/DOCS/HTML/fr/linux.html
+share/mplayer/DOCS/HTML/fr/macos.html
+share/mplayer/DOCS/HTML/fr/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/fr/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/fr/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/fr/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/fr/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/fr/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/fr/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/fr/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/fr/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/fr/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/fr/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/fr/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/fr/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/fr/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/fr/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/fr/menc-feat-x264.html
+share/mplayer/DOCS/HTML/fr/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/fr/mencoder.html
+share/mplayer/DOCS/HTML/fr/mga_vid.html
+share/mplayer/DOCS/HTML/fr/mpeg_decoders.html
+share/mplayer/DOCS/HTML/fr/mpst.html
+share/mplayer/DOCS/HTML/fr/mtrr.html
+share/mplayer/DOCS/HTML/fr/opengl.html
+share/mplayer/DOCS/HTML/fr/other.html
+share/mplayer/DOCS/HTML/fr/ports.html
+share/mplayer/DOCS/HTML/fr/radio.html
+share/mplayer/DOCS/HTML/fr/rtc.html
+share/mplayer/DOCS/HTML/fr/sdl.html
+share/mplayer/DOCS/HTML/fr/skin-file.html
+share/mplayer/DOCS/HTML/fr/skin-fonts.html
+share/mplayer/DOCS/HTML/fr/skin-gui.html
+share/mplayer/DOCS/HTML/fr/skin-overview.html
+share/mplayer/DOCS/HTML/fr/skin-quality.html
+share/mplayer/DOCS/HTML/fr/skin.html
+share/mplayer/DOCS/HTML/fr/softreq.html
+share/mplayer/DOCS/HTML/fr/streaming.html
+share/mplayer/DOCS/HTML/fr/subosd.html
+share/mplayer/DOCS/HTML/fr/svgalib.html
+share/mplayer/DOCS/HTML/fr/tdfx_vid.html
+share/mplayer/DOCS/HTML/fr/tdfxfb.html
+share/mplayer/DOCS/HTML/fr/tv-input.html
+share/mplayer/DOCS/HTML/fr/tv-teletext.html
+share/mplayer/DOCS/HTML/fr/tvout.html
+share/mplayer/DOCS/HTML/fr/unix.html
+share/mplayer/DOCS/HTML/fr/usage.html
+share/mplayer/DOCS/HTML/fr/vcd.html
+share/mplayer/DOCS/HTML/fr/vesa.html
+share/mplayer/DOCS/HTML/fr/video.html
+share/mplayer/DOCS/HTML/fr/vidix.html
+share/mplayer/DOCS/HTML/fr/windows.html
+share/mplayer/DOCS/HTML/fr/x11.html
+share/mplayer/DOCS/HTML/fr/xv.html
+share/mplayer/DOCS/HTML/hu/aalib.html
+share/mplayer/DOCS/HTML/hu/advaudio-channels.html
+share/mplayer/DOCS/HTML/hu/advaudio-surround.html
+share/mplayer/DOCS/HTML/hu/advaudio-volume.html
+share/mplayer/DOCS/HTML/hu/aspect.html
+share/mplayer/DOCS/HTML/hu/blinkenlights.html
+share/mplayer/DOCS/HTML/hu/bsd.html
+share/mplayer/DOCS/HTML/hu/bugreports.html
+share/mplayer/DOCS/HTML/hu/bugreports_advusers.html
+share/mplayer/DOCS/HTML/hu/bugreports_fix.html
+share/mplayer/DOCS/HTML/hu/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/hu/bugreports_report.html
+share/mplayer/DOCS/HTML/hu/bugreports_security.html
+share/mplayer/DOCS/HTML/hu/bugreports_what.html
+share/mplayer/DOCS/HTML/hu/bugreports_where.html
+share/mplayer/DOCS/HTML/hu/caca.html
+share/mplayer/DOCS/HTML/hu/codec-installation.html
+share/mplayer/DOCS/HTML/hu/commandline.html
+share/mplayer/DOCS/HTML/hu/control.html
+share/mplayer/DOCS/HTML/hu/default.css
+share/mplayer/DOCS/HTML/hu/dfbmga.html
+share/mplayer/DOCS/HTML/hu/dga.html
+share/mplayer/DOCS/HTML/hu/directfb.html
+share/mplayer/DOCS/HTML/hu/dummy.html
+share/mplayer/DOCS/HTML/hu/dvd.html
+share/mplayer/DOCS/HTML/hu/edl.html
+share/mplayer/DOCS/HTML/hu/encoding-guide.html
+share/mplayer/DOCS/HTML/hu/faq.html
+share/mplayer/DOCS/HTML/hu/fbdev.html
+share/mplayer/DOCS/HTML/hu/features.html
+share/mplayer/DOCS/HTML/hu/fonts-osd.html
+share/mplayer/DOCS/HTML/hu/gui.html
+share/mplayer/DOCS/HTML/hu/howtoread.html
+share/mplayer/DOCS/HTML/hu/index.html
+share/mplayer/DOCS/HTML/hu/install.html
+share/mplayer/DOCS/HTML/hu/intro.html
+share/mplayer/DOCS/HTML/hu/linux.html
+share/mplayer/DOCS/HTML/hu/macos.html
+share/mplayer/DOCS/HTML/hu/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/hu/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/hu/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/hu/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/hu/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/hu/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/hu/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/hu/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/hu/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/hu/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/hu/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/hu/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/hu/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/hu/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/hu/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/hu/menc-feat-x264.html
+share/mplayer/DOCS/HTML/hu/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/hu/mencoder.html
+share/mplayer/DOCS/HTML/hu/mga_vid.html
+share/mplayer/DOCS/HTML/hu/mpeg_decoders.html
+share/mplayer/DOCS/HTML/hu/networksync.html
+share/mplayer/DOCS/HTML/hu/opengl.html
+share/mplayer/DOCS/HTML/hu/ports.html
+share/mplayer/DOCS/HTML/hu/radio.html
+share/mplayer/DOCS/HTML/hu/rtc.html
+share/mplayer/DOCS/HTML/hu/skin-file.html
+share/mplayer/DOCS/HTML/hu/skin-fonts.html
+share/mplayer/DOCS/HTML/hu/skin-gui.html
+share/mplayer/DOCS/HTML/hu/skin-overview.html
+share/mplayer/DOCS/HTML/hu/skin-quality.html
+share/mplayer/DOCS/HTML/hu/skin.html
+share/mplayer/DOCS/HTML/hu/softreq.html
+share/mplayer/DOCS/HTML/hu/streaming.html
+share/mplayer/DOCS/HTML/hu/subosd.html
+share/mplayer/DOCS/HTML/hu/svgalib.html
+share/mplayer/DOCS/HTML/hu/tdfx_vid.html
+share/mplayer/DOCS/HTML/hu/tdfxfb.html
+share/mplayer/DOCS/HTML/hu/tv-examples.html
+share/mplayer/DOCS/HTML/hu/tv-input.html
+share/mplayer/DOCS/HTML/hu/tv-teletext-implementation-notes.html
+share/mplayer/DOCS/HTML/hu/tv-teletext-usage.html
+share/mplayer/DOCS/HTML/hu/tv-teletext.html
+share/mplayer/DOCS/HTML/hu/tv-tips.html
+share/mplayer/DOCS/HTML/hu/tvout.html
+share/mplayer/DOCS/HTML/hu/unix.html
+share/mplayer/DOCS/HTML/hu/usage.html
+share/mplayer/DOCS/HTML/hu/vcd.html
+share/mplayer/DOCS/HTML/hu/vesa.html
+share/mplayer/DOCS/HTML/hu/video.html
+share/mplayer/DOCS/HTML/hu/vidix.html
+share/mplayer/DOCS/HTML/hu/windows.html
+share/mplayer/DOCS/HTML/hu/x11.html
+share/mplayer/DOCS/HTML/hu/xv.html
+share/mplayer/DOCS/HTML/hu/zr.html
+share/mplayer/DOCS/HTML/it/aalib.html
+share/mplayer/DOCS/HTML/it/advaudio.html
+share/mplayer/DOCS/HTML/it/aspect.html
+share/mplayer/DOCS/HTML/it/bsd.html
+share/mplayer/DOCS/HTML/it/bugreports.html
+share/mplayer/DOCS/HTML/it/bugreports_advusers.html
+share/mplayer/DOCS/HTML/it/bugreports_fix.html
+share/mplayer/DOCS/HTML/it/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/it/bugreports_report.html
+share/mplayer/DOCS/HTML/it/bugreports_security.html
+share/mplayer/DOCS/HTML/it/bugreports_what.html
+share/mplayer/DOCS/HTML/it/bugreports_where.html
+share/mplayer/DOCS/HTML/it/caca.html
+share/mplayer/DOCS/HTML/it/codec_installation.html
+share/mplayer/DOCS/HTML/it/commandline.html
+share/mplayer/DOCS/HTML/it/control.html
+share/mplayer/DOCS/HTML/it/default.css
+share/mplayer/DOCS/HTML/it/dfbmga.html
+share/mplayer/DOCS/HTML/it/dga.html
+share/mplayer/DOCS/HTML/it/directfb.html
+share/mplayer/DOCS/HTML/it/drives.html
+share/mplayer/DOCS/HTML/it/dummy.html
+share/mplayer/DOCS/HTML/it/dvd.html
+share/mplayer/DOCS/HTML/it/edl.html
+share/mplayer/DOCS/HTML/it/encoding-guide.html
+share/mplayer/DOCS/HTML/it/faq.html
+share/mplayer/DOCS/HTML/it/fbdev.html
+share/mplayer/DOCS/HTML/it/features.html
+share/mplayer/DOCS/HTML/it/fonts-osd.html
+share/mplayer/DOCS/HTML/it/gui.html
+share/mplayer/DOCS/HTML/it/howtoread.html
+share/mplayer/DOCS/HTML/it/index.html
+share/mplayer/DOCS/HTML/it/install.html
+share/mplayer/DOCS/HTML/it/intro.html
+share/mplayer/DOCS/HTML/it/linux.html
+share/mplayer/DOCS/HTML/it/macos.html
+share/mplayer/DOCS/HTML/it/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/it/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/it/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/it/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/it/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/it/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/it/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/it/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/it/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/it/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/it/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/it/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/it/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/it/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/it/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/it/menc-feat-x264.html
+share/mplayer/DOCS/HTML/it/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/it/mencoder.html
+share/mplayer/DOCS/HTML/it/mga_vid.html
+share/mplayer/DOCS/HTML/it/mpeg_decoders.html
+share/mplayer/DOCS/HTML/it/mtrr.html
+share/mplayer/DOCS/HTML/it/opengl.html
+share/mplayer/DOCS/HTML/it/other.html
+share/mplayer/DOCS/HTML/it/ports.html
+share/mplayer/DOCS/HTML/it/radio.html
+share/mplayer/DOCS/HTML/it/rtc.html
+share/mplayer/DOCS/HTML/it/sdl.html
+share/mplayer/DOCS/HTML/it/skin-file.html
+share/mplayer/DOCS/HTML/it/skin-fonts.html
+share/mplayer/DOCS/HTML/it/skin-gui.html
+share/mplayer/DOCS/HTML/it/skin-overview.html
+share/mplayer/DOCS/HTML/it/skin-quality.html
+share/mplayer/DOCS/HTML/it/skin.html
+share/mplayer/DOCS/HTML/it/softreq.html
+share/mplayer/DOCS/HTML/it/streaming.html
+share/mplayer/DOCS/HTML/it/subosd.html
+share/mplayer/DOCS/HTML/it/svgalib.html
+share/mplayer/DOCS/HTML/it/tdfx_vid.html
+share/mplayer/DOCS/HTML/it/tdfxfb.html
+share/mplayer/DOCS/HTML/it/tv-input.html
+share/mplayer/DOCS/HTML/it/tv-teletext.html
+share/mplayer/DOCS/HTML/it/tvout.html
+share/mplayer/DOCS/HTML/it/unix.html
+share/mplayer/DOCS/HTML/it/usage.html
+share/mplayer/DOCS/HTML/it/vcd.html
+share/mplayer/DOCS/HTML/it/vesa.html
+share/mplayer/DOCS/HTML/it/video.html
+share/mplayer/DOCS/HTML/it/vidix.html
+share/mplayer/DOCS/HTML/it/windows.html
+share/mplayer/DOCS/HTML/it/x11.html
+share/mplayer/DOCS/HTML/it/xv.html
+share/mplayer/DOCS/HTML/pl/advaudio.html
+share/mplayer/DOCS/HTML/pl/aspect.html
+share/mplayer/DOCS/HTML/pl/bsd.html
+share/mplayer/DOCS/HTML/pl/bugreports.html
+share/mplayer/DOCS/HTML/pl/bugreports_advusers.html
+share/mplayer/DOCS/HTML/pl/bugreports_fix.html
+share/mplayer/DOCS/HTML/pl/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/pl/bugreports_report.html
+share/mplayer/DOCS/HTML/pl/bugreports_security.html
+share/mplayer/DOCS/HTML/pl/bugreports_what.html
+share/mplayer/DOCS/HTML/pl/bugreports_where.html
+share/mplayer/DOCS/HTML/pl/codec-installation.html
+share/mplayer/DOCS/HTML/pl/commandline.html
+share/mplayer/DOCS/HTML/pl/control.html
+share/mplayer/DOCS/HTML/pl/default.css
+share/mplayer/DOCS/HTML/pl/drives.html
+share/mplayer/DOCS/HTML/pl/dummy.html
+share/mplayer/DOCS/HTML/pl/dvd.html
+share/mplayer/DOCS/HTML/pl/edl.html
+share/mplayer/DOCS/HTML/pl/encoding-guide.html
+share/mplayer/DOCS/HTML/pl/faq.html
+share/mplayer/DOCS/HTML/pl/features.html
+share/mplayer/DOCS/HTML/pl/fonts-osd.html
+share/mplayer/DOCS/HTML/pl/gui.html
+share/mplayer/DOCS/HTML/pl/howtoread.html
+share/mplayer/DOCS/HTML/pl/index.html
+share/mplayer/DOCS/HTML/pl/install.html
+share/mplayer/DOCS/HTML/pl/intro.html
+share/mplayer/DOCS/HTML/pl/linux.html
+share/mplayer/DOCS/HTML/pl/macos.html
+share/mplayer/DOCS/HTML/pl/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/pl/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/pl/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/pl/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/pl/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/pl/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/pl/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/pl/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/pl/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/pl/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/pl/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/pl/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/pl/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/pl/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/pl/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/pl/menc-feat-x264.html
+share/mplayer/DOCS/HTML/pl/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/pl/mencoder.html
+share/mplayer/DOCS/HTML/pl/mpeg_decoders.html
+share/mplayer/DOCS/HTML/pl/mpst.html
+share/mplayer/DOCS/HTML/pl/mtrr.html
+share/mplayer/DOCS/HTML/pl/other.html
+share/mplayer/DOCS/HTML/pl/output-trad.html
+share/mplayer/DOCS/HTML/pl/ports.html
+share/mplayer/DOCS/HTML/pl/radio.html
+share/mplayer/DOCS/HTML/pl/rtc.html
+share/mplayer/DOCS/HTML/pl/skin-file.html
+share/mplayer/DOCS/HTML/pl/skin-fonts.html
+share/mplayer/DOCS/HTML/pl/skin-gui.html
+share/mplayer/DOCS/HTML/pl/skin-overview.html
+share/mplayer/DOCS/HTML/pl/skin-quality.html
+share/mplayer/DOCS/HTML/pl/skin.html
+share/mplayer/DOCS/HTML/pl/softreq.html
+share/mplayer/DOCS/HTML/pl/streaming.html
+share/mplayer/DOCS/HTML/pl/subosd.html
+share/mplayer/DOCS/HTML/pl/tv-input.html
+share/mplayer/DOCS/HTML/pl/tvout.html
+share/mplayer/DOCS/HTML/pl/unix.html
+share/mplayer/DOCS/HTML/pl/usage.html
+share/mplayer/DOCS/HTML/pl/vcd.html
+share/mplayer/DOCS/HTML/pl/video.html
+share/mplayer/DOCS/HTML/pl/windows.html
+share/mplayer/DOCS/HTML/ru/aalib.html
+share/mplayer/DOCS/HTML/ru/advaudio.html
+share/mplayer/DOCS/HTML/ru/aspect.html
+share/mplayer/DOCS/HTML/ru/bsd.html
+share/mplayer/DOCS/HTML/ru/bugreports.html
+share/mplayer/DOCS/HTML/ru/bugreports_advusers.html
+share/mplayer/DOCS/HTML/ru/bugreports_fix.html
+share/mplayer/DOCS/HTML/ru/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/ru/bugreports_report.html
+share/mplayer/DOCS/HTML/ru/bugreports_security.html
+share/mplayer/DOCS/HTML/ru/bugreports_what.html
+share/mplayer/DOCS/HTML/ru/bugreports_where.html
+share/mplayer/DOCS/HTML/ru/caca.html
+share/mplayer/DOCS/HTML/ru/codec-installation.html
+share/mplayer/DOCS/HTML/ru/commandline.html
+share/mplayer/DOCS/HTML/ru/control.html
+share/mplayer/DOCS/HTML/ru/default.css
+share/mplayer/DOCS/HTML/ru/dfbmga.html
+share/mplayer/DOCS/HTML/ru/dga.html
+share/mplayer/DOCS/HTML/ru/directfb.html
+share/mplayer/DOCS/HTML/ru/drives.html
+share/mplayer/DOCS/HTML/ru/dummy.html
+share/mplayer/DOCS/HTML/ru/dvd.html
+share/mplayer/DOCS/HTML/ru/edl.html
+share/mplayer/DOCS/HTML/ru/encoding-guide.html
+share/mplayer/DOCS/HTML/ru/faq.html
+share/mplayer/DOCS/HTML/ru/fbdev.html
+share/mplayer/DOCS/HTML/ru/features.html
+share/mplayer/DOCS/HTML/ru/fonts-osd.html
+share/mplayer/DOCS/HTML/ru/gui.html
+share/mplayer/DOCS/HTML/ru/howtoread.html
+share/mplayer/DOCS/HTML/ru/index.html
+share/mplayer/DOCS/HTML/ru/install.html
+share/mplayer/DOCS/HTML/ru/intro.html
+share/mplayer/DOCS/HTML/ru/linux.html
+share/mplayer/DOCS/HTML/ru/macos.html
+share/mplayer/DOCS/HTML/ru/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/ru/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/ru/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/ru/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/ru/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/ru/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/ru/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/ru/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/ru/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/ru/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/ru/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/ru/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/ru/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/ru/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/ru/menc-feat-x264.html
+share/mplayer/DOCS/HTML/ru/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/ru/mencoder.html
+share/mplayer/DOCS/HTML/ru/mga_vid.html
+share/mplayer/DOCS/HTML/ru/mpeg_decoders.html
+share/mplayer/DOCS/HTML/ru/mtrr.html
+share/mplayer/DOCS/HTML/ru/opengl.html
+share/mplayer/DOCS/HTML/ru/other.html
+share/mplayer/DOCS/HTML/ru/ports.html
+share/mplayer/DOCS/HTML/ru/radio.html
+share/mplayer/DOCS/HTML/ru/rtc.html
+share/mplayer/DOCS/HTML/ru/sdl.html
+share/mplayer/DOCS/HTML/ru/skin-file.html
+share/mplayer/DOCS/HTML/ru/skin-fonts.html
+share/mplayer/DOCS/HTML/ru/skin-gui.html
+share/mplayer/DOCS/HTML/ru/skin-overview.html
+share/mplayer/DOCS/HTML/ru/skin-quality.html
+share/mplayer/DOCS/HTML/ru/skin.html
+share/mplayer/DOCS/HTML/ru/softreq.html
+share/mplayer/DOCS/HTML/ru/streaming.html
+share/mplayer/DOCS/HTML/ru/subosd.html
+share/mplayer/DOCS/HTML/ru/svgalib.html
+share/mplayer/DOCS/HTML/ru/tdfx_vid.html
+share/mplayer/DOCS/HTML/ru/tdfxfb.html
+share/mplayer/DOCS/HTML/ru/tv-input.html
+share/mplayer/DOCS/HTML/ru/tv-teletext.html
+share/mplayer/DOCS/HTML/ru/tvout.html
+share/mplayer/DOCS/HTML/ru/unix.html
+share/mplayer/DOCS/HTML/ru/usage.html
+share/mplayer/DOCS/HTML/ru/vcd.html
+share/mplayer/DOCS/HTML/ru/vesa.html
+share/mplayer/DOCS/HTML/ru/video.html
+share/mplayer/DOCS/HTML/ru/vidix.html
+share/mplayer/DOCS/HTML/ru/windows.html
+share/mplayer/DOCS/HTML/ru/x11.html
+share/mplayer/DOCS/HTML/ru/xv.html
+share/mplayer/DOCS/HTML/zh_CN/aalib.html
+share/mplayer/DOCS/HTML/zh_CN/advaudio-channels.html
+share/mplayer/DOCS/HTML/zh_CN/advaudio-surround.html
+share/mplayer/DOCS/HTML/zh_CN/advaudio-volume.html
+share/mplayer/DOCS/HTML/zh_CN/aspect.html
+share/mplayer/DOCS/HTML/zh_CN/blinkenlights.html
+share/mplayer/DOCS/HTML/zh_CN/bsd.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_advusers.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_fix.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_regression_test.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_report.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_security.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_what.html
+share/mplayer/DOCS/HTML/zh_CN/bugreports_where.html
+share/mplayer/DOCS/HTML/zh_CN/caca.html
+share/mplayer/DOCS/HTML/zh_CN/codec-installation.html
+share/mplayer/DOCS/HTML/zh_CN/commandline.html
+share/mplayer/DOCS/HTML/zh_CN/control.html
+share/mplayer/DOCS/HTML/zh_CN/default.css
+share/mplayer/DOCS/HTML/zh_CN/dfbmga.html
+share/mplayer/DOCS/HTML/zh_CN/dga.html
+share/mplayer/DOCS/HTML/zh_CN/directfb.html
+share/mplayer/DOCS/HTML/zh_CN/drives.html
+share/mplayer/DOCS/HTML/zh_CN/dummy.html
+share/mplayer/DOCS/HTML/zh_CN/dvd.html
+share/mplayer/DOCS/HTML/zh_CN/edl.html
+share/mplayer/DOCS/HTML/zh_CN/encoding-guide.html
+share/mplayer/DOCS/HTML/zh_CN/faq.html
+share/mplayer/DOCS/HTML/zh_CN/fbdev.html
+share/mplayer/DOCS/HTML/zh_CN/features.html
+share/mplayer/DOCS/HTML/zh_CN/fonts-osd.html
+share/mplayer/DOCS/HTML/zh_CN/gui.html
+share/mplayer/DOCS/HTML/zh_CN/howtoread.html
+share/mplayer/DOCS/HTML/zh_CN/index.html
+share/mplayer/DOCS/HTML/zh_CN/install.html
+share/mplayer/DOCS/HTML/zh_CN/intro.html
+share/mplayer/DOCS/HTML/zh_CN/linux.html
+share/mplayer/DOCS/HTML/zh_CN/macos.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-handheld-psp.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-quicktime-7.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-selecting-input.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-video-for-windows.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-x264.html
+share/mplayer/DOCS/HTML/zh_CN/menc-feat-xvid.html
+share/mplayer/DOCS/HTML/zh_CN/mencoder.html
+share/mplayer/DOCS/HTML/zh_CN/mga_vid.html
+share/mplayer/DOCS/HTML/zh_CN/mpeg_decoders.html
+share/mplayer/DOCS/HTML/zh_CN/opengl.html
+share/mplayer/DOCS/HTML/zh_CN/ports.html
+share/mplayer/DOCS/HTML/zh_CN/radio.html
+share/mplayer/DOCS/HTML/zh_CN/rtc.html
+share/mplayer/DOCS/HTML/zh_CN/skin-file.html
+share/mplayer/DOCS/HTML/zh_CN/skin-fonts.html
+share/mplayer/DOCS/HTML/zh_CN/skin-gui.html
+share/mplayer/DOCS/HTML/zh_CN/skin-overview.html
+share/mplayer/DOCS/HTML/zh_CN/skin-quality.html
+share/mplayer/DOCS/HTML/zh_CN/skin.html
+share/mplayer/DOCS/HTML/zh_CN/softreq.html
+share/mplayer/DOCS/HTML/zh_CN/streaming.html
+share/mplayer/DOCS/HTML/zh_CN/subosd.html
+share/mplayer/DOCS/HTML/zh_CN/svgalib.html
+share/mplayer/DOCS/HTML/zh_CN/tdfx_vid.html
+share/mplayer/DOCS/HTML/zh_CN/tdfxfb.html
+share/mplayer/DOCS/HTML/zh_CN/tv-input.html
+share/mplayer/DOCS/HTML/zh_CN/tv-teletext.html
+share/mplayer/DOCS/HTML/zh_CN/tvout.html
+share/mplayer/DOCS/HTML/zh_CN/unix.html
+share/mplayer/DOCS/HTML/zh_CN/usage.html
+share/mplayer/DOCS/HTML/zh_CN/vcd.html
+share/mplayer/DOCS/HTML/zh_CN/vesa.html
+share/mplayer/DOCS/HTML/zh_CN/video.html
+share/mplayer/DOCS/HTML/zh_CN/vidix.html
+share/mplayer/DOCS/HTML/zh_CN/windows.html
+share/mplayer/DOCS/HTML/zh_CN/x11.html
+share/mplayer/DOCS/HTML/zh_CN/xv.html
+share/mplayer/DOCS/HTML/zh_CN/zr.html
 share/mplayer/DOCS/README
 share/mplayer/DOCS/default.css
 share/mplayer/DOCS/man/cs/mplayer.1
@@ -21,8 +857,8 @@ share/mplayer/DOCS/tech/codec-devel.txt
 share/mplayer/DOCS/tech/codecs-in.html
 share/mplayer/DOCS/tech/codecs.conf.txt
 share/mplayer/DOCS/tech/colorspaces.txt
+share/mplayer/DOCS/tech/crosscompile.txt
 share/mplayer/DOCS/tech/dr-methods.txt
-share/mplayer/DOCS/tech/dvdnav-howto.txt
 share/mplayer/DOCS/tech/encoding-guide.txt
 share/mplayer/DOCS/tech/encoding-tips.txt
 share/mplayer/DOCS/tech/formats.txt
@@ -32,7 +868,6 @@ share/mplayer/DOCS/tech/libao2.txt
 share/mplayer/DOCS/tech/libmpcodecs.txt
 share/mplayer/DOCS/tech/libvo.txt
 share/mplayer/DOCS/tech/manpage.txt
-share/mplayer/DOCS/tech/mingw-crosscompile.txt
 share/mplayer/DOCS/tech/mirrors/mirror_howto.txt
 share/mplayer/DOCS/tech/mirrors/update_mplayer_rsync
 share/mplayer/DOCS/tech/mpdsf.txt
@@ -45,6 +880,7 @@ share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt
 share/mplayer/DOCS/tech/realcodecs/streaming.txt
 share/mplayer/DOCS/tech/realcodecs/video-codecs.txt
 share/mplayer/DOCS/tech/release-howto.txt
+share/mplayer/DOCS/tech/release.sh
 share/mplayer/DOCS/tech/slave.txt
 share/mplayer/DOCS/tech/snow.txt
 share/mplayer/DOCS/tech/subcp.txt
@@ -56,8 +892,6 @@ share/mplayer/DOCS/tech/vidix.txt
 share/mplayer/DOCS/tech/win32-codec-howto.txt
 share/mplayer/DOCS/tech/wishlist
 share/mplayer/DOCS/xml/README
-share/mplayer/DOCS/xml/Makefile
-share/mplayer/DOCS/xml/configure
 share/mplayer/DOCS/xml/cs/bugreports.xml
 share/mplayer/DOCS/xml/cs/documentation.xml
 share/mplayer/DOCS/xml/cs/encoding-guide.xml
@@ -155,9 +989,9 @@ share/mplayer/DOCS/xml/xsl/ldp-html-chunk.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html-common.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html.xsl
 share/mplayer/DOCS/xml/xsl/ldp-print.xsl
-share/mplayer/DOCS/xml/zh_CN/encoding-guide.xml
 share/mplayer/DOCS/xml/zh_CN/bugreports.xml
 share/mplayer/DOCS/xml/zh_CN/documentation.xml
+share/mplayer/DOCS/xml/zh_CN/encoding-guide.xml
 share/mplayer/DOCS/xml/zh_CN/faq.xml
 share/mplayer/DOCS/xml/zh_CN/install.xml
 share/mplayer/DOCS/xml/zh_CN/mencoder.xml
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 759f786e258..6c76bddb1e5 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.74 2011/11/02 16:35:14 drochner Exp $
+$NetBSD: distinfo,v 1.75 2012/06/11 13:41:12 wiz Exp $
 
-SHA1 (mplayer/mplayer-20100913.tar.bz2) = 6fd3acb29fa8455636bcd86f9f333da4763daa6d
-RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d
-Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
-SHA1 (patch-aa) = a1d82fd9999c656bd9ecf703cd9f2c0245330874
-SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6
-SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
-SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac
-SHA1 (patch-ae) = 7e1f05cd6e09f8755debfff7061dadf0a8ca3a3f
-SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
-SHA1 (patch-ah) = dcfc26ec1422581a03ab200cb95926f6fd896d5b
-SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
-SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
-SHA1 (patch-as) = e353a1437101f661e012ce37004d8920913725cd
-SHA1 (patch-libao2_ao_sun.c) = 14eedc06f70dd949da1fb84078877e7cf259eff1
+SHA1 (mplayer/MPlayer-1.1.tar.gz) = e46e3294bc96daabe604e4e195721e4f2d1e5b48
+RMD160 (mplayer/MPlayer-1.1.tar.gz) = 0369e57677c0c30f3b05f80ee1c4d8d7d1217e63
+Size (mplayer/MPlayer-1.1.tar.gz) = 17018391 bytes
+SHA1 (patch-aa) = bd0dab582534ae216b49eef52c4a6c82288ce23d
+SHA1 (patch-ae) = b9033bc0c6582707e25e469a23e2d7bf6c790717
+SHA1 (patch-an) = 3b1af01b3b3e81d0583abb97b6a837b38476157b
+SHA1 (patch-ar) = f48a889a11e2c958cf9e939d831e371b00474489
+SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-stream_dvb_tune.c) = b663830ff64ab31488684b1a324da50ab52d68cc
 SHA1 (patch-stream_dvbin.h) = 56f6e71fcdf6bf3afccbdbc8682834c806114677
-SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
-SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89
+SHA1 (patch-sub_osd.c) = 47b17b4f7e998341a06ff231a1cbae30ec9651cc
+SHA1 (patch-sub_subreader.c) = 06b7d90e2a46ee63e4385c805e2f5989549336b5
+SHA1 (patch-ve_x264) = 42b133d230bc536d952cdc1b9b172891462fe388
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index daa724faeb1..1c58fc49a6b 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.44 2011/03/09 16:34:02 drochner Exp $
+# $NetBSD: options.mk,v 1.45 2012/06/11 13:41:12 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -13,6 +13,12 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 # Define PKG_SUPPORTED_OPTIONS based on the current package and system.
 # -------------------------------------------------------------------------
 
+# Note: It is a good practice that all PKG_SUPPORTED_OPTIONS are
+# enabled or disabled with --enable-option or --disable-option.
+# It is better to add missing libs via EXTRA_LIBS, when it is possible,
+# instead of patching the configure script in order to make the update of
+# the packages easier.
+
 # Options supported by both mplayer* or mencoder*.
 
 PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv png theora vorbis x264 debug
@@ -21,9 +27,8 @@ PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
 PKG_SUPPORTED_OPTIONS+=	oss
 .endif
 
-PKG_OPTIONS_OPTIONAL_GROUPS=	faadgroup
-PKG_OPTIONS_GROUP.faadgroup=	faad mplayer-internal-faad
-PKG_SUGGESTED_OPTIONS+=		mplayer-internal-faad
+PKG_SUPPORTED_OPTIONS+= 	faad
+PKG_SUGGESTED_OPTIONS+=		faad
 
 # Set options based on the specific package being built.
 .if !empty(PKGNAME:M*mplayer*)
@@ -50,6 +55,7 @@ PKG_SUPPORTED_OPTIONS+=	mlib
 PKG_SUPPORTED_OPTIONS+=	vidix
 .endif
 
+# TODO: v4l2 option probably could be supported on Linux and OpenBSD too
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
 PKG_SUPPORTED_OPTIONS+=	v4l2
 PKG_SUGGESTED_OPTIONS+=	v4l2
@@ -79,13 +85,13 @@ PKG_SUPPORTED_OPTIONS+= xvid
 # Define PKG_SUGGESTED_OPTIONS.
 # -------------------------------------------------------------------------
 
-.for _o_ in aalib arts cdparanoia dv esound gif jpeg \
+.for o in aalib arts cdparanoia dv esound gif jpeg \
 	    dvdread dvdnav \
 	    lame mad mplayer-menu mplayer-real \
 	    mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
 	    nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau
-.  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
-PKG_SUGGESTED_OPTIONS+=	${_o_}
+.  if !empty(PKG_SUPPORTED_OPTIONS:M${o})
+PKG_SUGGESTED_OPTIONS+=	${o}
 .  endif
 .endfor
 .if ${OPSYS} == "Linux"
@@ -104,7 +110,10 @@ EXTRA_LIBS=
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Maalib)
+CONFIGURE_ARGS+=	--enable-aa
 .  include "../../graphics/aalib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-aa
 .endif
 
 .if !empty(PKG_OPTIONS:Marts)
@@ -118,6 +127,8 @@ CONFIGURE_ARGS+=	--disable-arts
 .if !empty(PKG_OPTIONS:Mcaca)
 CONFIGURE_ARGS+=	--enable-caca
 .  include "../../graphics/libcaca/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-caca
 .endif
 
 .if !empty(PKG_OPTIONS:Mcdparanoia)
@@ -175,18 +186,18 @@ CONFIGURE_ARGS+=	--disable-esd
 .endif
 
 .if !empty(PKG_OPTIONS:Mfaac)
+CONFIGURE_ARGS+=	--enable-faac
+EXTRA_LIBS+=		-lfaac
 .  include "../../audio/faac/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-faac
 .endif
 
-.if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
-CONFIGURE_ARGS+=	--disable-faad-internal
-.elif !empty(PKG_OPTIONS:Mfaad)
+.if !empty(PKG_OPTIONS:Mfaad)
 CONFIGURE_ARGS+=	--enable-faad
 .  include "../../audio/faad2/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--enable-faad-internal
+CONFIGURE_ARGS+=	--disable-faad
 .endif
 
 .if !empty(PKG_OPTIONS:Mggi)
@@ -211,10 +222,10 @@ CONFIGURE_ARGS+=	--disable-jpeg
 .endif
 
 .if !empty(PKG_OPTIONS:Mlame)
-#CONFIGURE_ARGS+=	--enable-toolame
+CONFIGURE_ARGS+=	--enable-mp3lame
 .  include "../../audio/lame/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-toolame
+CONFIGURE_ARGS+=	--disable-mp3lame
 .endif
 
 .if !empty(PKG_OPTIONS:Mmad)
@@ -237,10 +248,7 @@ CONFIGURE_ARGS+=	--disable-menu
 .endif
 
 .if !empty(PKG_OPTIONS:Mmplayer-real)
-EVAL_PREFIX+=		PREFIX.realplayer-codecs=realplayer-codecs
-PREFIX.realplayer-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-real
-#CONFIGURE_ARGS+=	--realcodecsdir="${PREFIX.realplayer-codecs}/lib/RealPlayer8-Codecs"
 DEPENDS+=		realplayer-codecs>=8nb2:../../multimedia/realplayer-codecs
 .else
 CONFIGURE_ARGS+=	--disable-real
@@ -253,10 +261,7 @@ CONFIGURE_ARGS+=	--disable-runtime-cpudetection
 .endif
 
 .if !empty(PKG_OPTIONS:Mmplayer-win32)
-EVAL_PREFIX+=		PREFIX.win32-codecs=win32-codecs
-PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-win32dll
-#CONFIGURE_ARGS+=	--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=		win32-codecs>=011227:../../multimedia/win32-codecs
 .else
 CONFIGURE_ARGS+=	--disable-win32dll
@@ -304,9 +309,7 @@ CONFIGURE_ARGS+=	--enable-theora
 CONFIGURE_ARGS+=	--disable-theora
 .endif
 
-.if !empty(PKG_OPTIONS:Mv4l2)
-CONFIGURE_ARGS+=	--enable-tv-v4l2
-.else
+.if empty(PKG_OPTIONS:Mv4l2)
 CONFIGURE_ARGS+=	--disable-tv-v4l2
 .endif
 
@@ -322,6 +325,8 @@ CONFIGURE_ARGS+=	--disable-libvorbis
 .endif
 
 .if !empty(PKG_OPTIONS:Mx264)
+CONFIGURE_ARGS+=	--enable-x264
+EXTRA_LIBS+=		-lx264
 .  include "../../multimedia/x264-devel/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-x264
@@ -344,6 +349,7 @@ CONFIGURE_ARGS+=	--disable-ssse3
 .endif
 
 .if !empty(PKG_OPTIONS:Mvdpau)
+CONFIGURE_ARGS+=	--enable-vdpau
 .  include "../../multimedia/libvdpau/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-vdpau
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index fef378a1c9e..2c3e9993c47 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,31 +1,18 @@
-$NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
+$NetBSD: patch-aa,v 1.28 2012/06/11 13:41:12 wiz Exp $
 
---- configure.orig	2010-09-13 03:12:07.000000000 +0000
+--- configure.orig	2012-05-22 18:01:51.000000000 +0000
 +++ configure
-@@ -1471,6 +1471,12 @@ if test -z "$_target" ; then
-    powerpc) # Darwin returns 'powerpc'
-      host_arch=ppc
-      ;;
-+   mipseb|mipsel) # NetBSD
-+     host_arch=mips
-+     ;;
-+   sh3eb|sh3el) # NetBSD
-+     host_arch=sh
-+     ;;
-    *) # uname -p on Linux returns 'unknown' for the processor type,
-       # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)'
- 
-@@ -1488,7 +1494,8 @@ if test -z "$_target" ; then
-       sparc64) host_arch=sparc64 ;;
+@@ -1520,7 +1520,8 @@ if test -z "$_target" ; then
+       sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
        arm*|zaurus|cats) host_arch=arm ;;
 -      sh3|sh4|sh4a) host_arch=sh ;;
-+      sh3) host_arch=sh ;;
-+      sh4|sh4a) host_arch=sh4 ;;
++      sh3*) host_arch=sh ;;
++	  sh4|sh4a) host_arch=sh4 ;;
        s390) host_arch=s390 ;;
        s390x) host_arch=s390x ;;
        *mips*) host_arch=mips ;;
-@@ -1645,7 +1652,7 @@ else
+@@ -1674,7 +1675,7 @@ else
        cc_name=$cc_name_tmp
        echocheck "$_cc version"
        cc_vendor=gnu
@@ -34,7 +21,7 @@ $NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
        case $cc_version in
          2.96*)
            cc_fail=yes
-@@ -1763,7 +1770,7 @@ if x86 ; then
+@@ -1798,7 +1799,7 @@ if x86 ; then
    # gather more CPU information
    pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
    pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1)
@@ -43,7 +30,7 @@ $NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
    pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
    pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
  
-@@ -2238,7 +2245,12 @@ case "$host_arch" in
+@@ -2274,7 +2275,12 @@ case "$host_arch" in
      test $_fast_clz = "auto" && _fast_clz=yes
      ;;
  
@@ -57,44 +44,37 @@ $NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
      arch='sh4'
      iproc='sh4'
      ;;
-@@ -3713,7 +3725,6 @@ test "$_w32threads" = yes && def_threads
- echores "$_w32threads"
- 
- echocheck "rpath"
--netbsd &&_rpath=yes
- if test "$_rpath" = yes ; then
-   for I in $(echo $extra_ldflags | sed 's/-L//g') ; do
-     tmp="$tmp $(echo $I | sed 's/.*/ -L& -Wl,-R&/')"
-@@ -3978,7 +3989,6 @@ echores "$_vsscanf"
- 
- echocheck "swab()"
- cat > $TMPC << EOF
--#define _XOPEN_SOURCE 600
- #include <unistd.h>
- int main(void) { swab(0, 0, 0); return 0; }
- EOF
-@@ -4488,7 +4498,11 @@ EOF
+@@ -4288,7 +4294,11 @@ if test "$_x11" = auto && test "$_x11_he
             -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
             -L/usr/lib ; do
      if netbsd; then
--      _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
-+      if test -n "$I" ; then
-+        _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
-+      else
-+        _ld_tmp="-lXext -lX11 $_ld_pthread"
-+      fi
+-      ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
++	  if test -n "$I" ; then
++        ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
++	  else
++        ld_tmp="-lXext -lX11 $ld_pthread"
++	  fi
      else
-       _ld_tmp="$I -lXext -lX11 $_ld_pthread"
+       ld_tmp="$I -lXext -lX11 $ld_pthread"
      fi
-@@ -5016,7 +5016,6 @@ EOF
-       extra_cflags="$extra_cflags $_inc_tmp" && break
+@@ -4669,6 +4679,8 @@ if test "$_aa" = yes ; then
+   def_aa='#define CONFIG_AA 1'
+   if cygwin ; then
+     libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
++  else
++    libs_mplayer="$libs_mplayer $(aalib-config --libs)"
+   fi
+   vomodules="aa $vomodules"
+ else
+@@ -4756,7 +4768,6 @@ EOF
+       extra_cflags="$extra_cflags $inc_tmp" && break
    done
  fi
 -echores "$_dvb"
  if test "$_dvb" = yes ; then
    _dvbin=yes
    inputmodules="dvb $inputmodules"
-@@ -5025,14 +5024,28 @@ if test "$_dvb" = yes ; then
+@@ -4765,14 +4776,29 @@ if test "$_dvb" = yes ; then
    aomodules="mpegpes(dvb) $aomodules"
    vomodules="mpegpes(dvb) $vomodules"
  else
@@ -125,17 +105,16 @@ $NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
 +    vomodules="mpegpes(file) $vomodules"
 +  fi
  fi
--
+ 
 +echores "$_dvb"
  
  if darwin; then
  
-@@ -5623,8 +5637,13 @@ if test "$_ivtv" = auto ; then
+@@ -5338,7 +5364,12 @@ echocheck "IVTV TV-Out (pre linux-2.6.24
+ if test "$_ivtv" = auto ; then
    cat > $TMPC << EOF
- #include <stdlib.h>
- #include <inttypes.h>
-++#ifdef __linux__
- #include <linux/types.h>
+ #include <sys/time.h>
++#ifdef __linux__
  #include <linux/videodev2.h>
 +#elif defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <sys/types.h>
@@ -144,12 +123,3 @@ $NetBSD: patch-aa,v 1.27 2011/07/09 15:51:52 jmcneill Exp $
  #include <linux/ivtv.h>
  #include <sys/ioctl.h>
  int main(void) {
-@@ -8057,7 +8076,7 @@ echores "$_tv_v4l1"
- echocheck "Video 4 Linux 2 TV interface"
- if test "$_tv_v4l2" = auto ; then
-   _tv_v4l2=no
--  if test "$_tv" = yes && linux ; then
-+  if test "$_tv" = yes && (linux || netbsd || openbsd) ; then
-     header_check linux/videodev2.h && _tv_v4l2=yes
-   fi
- fi
diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab
deleted file mode 100644
index 61cc4d571ad..00000000000
--- a/multimedia/mplayer-share/patches/patch-ab
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2010/11/23 12:31:30 tron Exp $
-
-Fix for CVE-2010-3429 taken from here:
-
-http://git.ffmpeg.org/?p=ffmpeg;a=commitdiff;h=16c592155f117ccd7b86006c45aacc692a81c23b;hp=2abacdf610d598073838a7e72698b8421461aead
-
---- libavcodec/flicvideo.c.orig	2010-04-20 15:45:34.000000000 +0100
-+++ libavcodec/flicvideo.c	2010-11-23 12:14:07.000000000 +0000
-@@ -159,7 +159,7 @@
-     int pixel_skip;
-     int pixel_countdown;
-     unsigned char *pixels;
--    int pixel_limit;
-+    unsigned int pixel_limit;
- 
-     s->frame.reference = 1;
-     s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
-@@ -253,10 +253,13 @@
-                     av_log(avctx, AV_LOG_ERROR, "Undefined opcode (%x) in DELTA_FLI\n", line_packets);
-                 } else if ((line_packets & 0xC000) == 0x8000) {
-                     // "last byte" opcode
--                    pixels[y_ptr + s->frame.linesize[0] - 1] = line_packets & 0xff;
-+                    pixel_ptr= y_ptr + s->frame.linesize[0] - 1;
-+                    CHECK_PIXEL_PTR(0);
-+                    pixels[pixel_ptr] = line_packets & 0xff;
-                 } else {
-                     compressed_lines--;
-                     pixel_ptr = y_ptr;
-+                    CHECK_PIXEL_PTR(0);
-                     pixel_countdown = s->avctx->width;
-                     for (i = 0; i < line_packets; i++) {
-                         /* account for the skip bytes */
-@@ -268,7 +271,7 @@
-                             byte_run = -byte_run;
-                             palette_idx1 = buf[stream_ptr++];
-                             palette_idx2 = buf[stream_ptr++];
--                            CHECK_PIXEL_PTR(byte_run);
-+                            CHECK_PIXEL_PTR(byte_run * 2);
-                             for (j = 0; j < byte_run; j++, pixel_countdown -= 2) {
-                                 pixels[pixel_ptr++] = palette_idx1;
-                                 pixels[pixel_ptr++] = palette_idx2;
-@@ -298,6 +301,7 @@
-             stream_ptr += 2;
-             while (compressed_lines > 0) {
-                 pixel_ptr = y_ptr;
-+                CHECK_PIXEL_PTR(0);
-                 pixel_countdown = s->avctx->width;
-                 line_packets = buf[stream_ptr++];
-                 if (line_packets > 0) {
-@@ -453,7 +457,7 @@
-     int pixel_countdown;
-     unsigned char *pixels;
-     int pixel;
--    int pixel_limit;
-+    unsigned int pixel_limit;
- 
-     s->frame.reference = 1;
-     s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
-@@ -503,6 +507,7 @@
-                 } else {
-                     compressed_lines--;
-                     pixel_ptr = y_ptr;
-+                    CHECK_PIXEL_PTR(0);
-                     pixel_countdown = s->avctx->width;
-                     for (i = 0; i < line_packets; i++) {
-                         /* account for the skip bytes */
-@@ -514,13 +519,13 @@
-                             byte_run = -byte_run;
-                             pixel    = AV_RL16(&buf[stream_ptr]);
-                             stream_ptr += 2;
--                            CHECK_PIXEL_PTR(byte_run);
-+                            CHECK_PIXEL_PTR(2 * byte_run);
-                             for (j = 0; j < byte_run; j++, pixel_countdown -= 2) {
-                                 *((signed short*)(&pixels[pixel_ptr])) = pixel;
-                                 pixel_ptr += 2;
-                             }
-                         } else {
--                            CHECK_PIXEL_PTR(byte_run);
-+                            CHECK_PIXEL_PTR(2 * byte_run);
-                             for (j = 0; j < byte_run; j++, pixel_countdown--) {
-                                 *((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[stream_ptr]);
-                                 stream_ptr += 2;
-@@ -611,7 +616,7 @@
-                     if (byte_run > 0) {
-                         pixel    = AV_RL16(&buf[stream_ptr]);
-                         stream_ptr += 2;
--                        CHECK_PIXEL_PTR(byte_run);
-+                        CHECK_PIXEL_PTR(2 * byte_run);
-                         for (j = 0; j < byte_run; j++) {
-                             *((signed short*)(&pixels[pixel_ptr])) = pixel;
-                             pixel_ptr += 2;
-@@ -622,7 +627,7 @@
-                         }
-                     } else {  /* copy pixels if byte_run < 0 */
-                         byte_run = -byte_run;
--                        CHECK_PIXEL_PTR(byte_run);
-+                        CHECK_PIXEL_PTR(2 * byte_run);
-                         for (j = 0; j < byte_run; j++) {
-                             *((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[stream_ptr]);
-                             stream_ptr += 2;
diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac
deleted file mode 100644
index c2378a22bbf..00000000000
--- a/multimedia/mplayer-share/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2010/09/16 18:56:12 wiz Exp $
-
---- libfaad2/common.h.orig	2009-07-26 19:53:00.000000000 +0000
-+++ libfaad2/common.h
-@@ -320,7 +320,7 @@ char *strchr(), *strrchr();
-   #elif (defined(__i386__) && defined(__GNUC__)) && !HAVE_LRINTF
-     #define HAS_LRINTF
-     // from http://www.stereopsis.com/FPU.html
--    static INLINE int lrintf(float f)
-+    static INLINE long int lrintf(float f)
-     {
-         int i;
-         __asm__ __volatile__ (
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
deleted file mode 100644
index e53e2d6dc19..00000000000
--- a/multimedia/mplayer-share/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.11 2011/01/14 10:44:27 wiz Exp $
-
-Fix build with png-1.5.
-
---- libmpcodecs/vd_mpng.c.orig	2010-02-26 15:01:37.000000000 +0000
-+++ libmpcodecs/vd_mpng.c
-@@ -74,7 +74,7 @@ static int    pngLength;
- 
- static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size )
- {
-- char * p = pngstr->io_ptr;
-+ char * p = png_get_io_ptr(pngstr);
-  if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer;
-  fast_memcpy( buffer,(char *)&p[pngPointer],size );
-  pngPointer+=size;
-@@ -111,7 +111,7 @@ static mp_image_t* decode(sh_video_t *sh
-  png_get_IHDR( png,info,&png_width,&png_height,&depth,&color,NULL,NULL,NULL );
-  png_set_bgr( png );
- 
-- switch( info->color_type ) {
-+ switch( png_get_color_type( png,info ) ) {
-    case PNG_COLOR_TYPE_GRAY_ALPHA:
-       mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry gray scaled png with alpha channel not supported at moment.\n" );
-       break;
-@@ -128,7 +128,7 @@ static mp_image_t* decode(sh_video_t *sh
-       out_fmt=IMGFMT_BGR24;
-       break;
-    default:
--      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,info->color_type);
-+      mp_msg( MSGT_DECVIDEO,MSGL_INFO,"Sorry, unsupported PNG colorspace: %d.\n" ,png_get_color_type( png,info ));
-  }
- 
-  // (re)init libvo if image parameters changed (width/height/colorspace)
diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
index 453d824d0f6..f3ebad334d2 100644
--- a/multimedia/mplayer-share/patches/patch-ae
+++ b/multimedia/mplayer-share/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.11 2010/09/16 18:56:12 wiz Exp $
+$NetBSD: patch-ae,v 1.12 2012/06/11 13:41:13 wiz Exp $
 
---- libvo/aclib.c.orig	2010-01-03 09:20:01.000000000 +0000
+--- libvo/aclib.c.orig	2011-11-07 19:54:49.000000000 +0000
 +++ libvo/aclib.c
-@@ -30,6 +30,11 @@
- #include "libavutil/x86_cpu.h"
+@@ -29,6 +29,11 @@
+ #include "fastmemcpy.h"
  #undef memcpy
  
 +#if ARCH_X86 && defined(__APPLE__)
diff --git a/multimedia/mplayer-share/patches/patch-an b/multimedia/mplayer-share/patches/patch-an
index 3669f83cba2..9997efb0b5c 100644
--- a/multimedia/mplayer-share/patches/patch-an
+++ b/multimedia/mplayer-share/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.2 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: patch-an,v 1.3 2012/06/11 13:41:13 wiz Exp $
 
---- stream/vcd_read_fbsd.h.orig	2008-03-10 20:28:42.000000000 +0100
+--- stream/vcd_read_fbsd.h.orig	2011-05-07 21:32:50.000000000 +0000
 +++ stream/vcd_read_fbsd.h
-@@ -41,9 +41,8 @@ typedef struct mp_vcd_priv_st {
+@@ -63,9 +63,8 @@ typedef struct mp_vcd_priv_st {
    vcd_tocentry entry;
  #ifdef VCD_NETBSD
    struct cd_toc_entry entry_data;
@@ -13,7 +13,7 @@ $NetBSD: patch-an,v 1.2 2009/10/18 22:22:10 ahoka Exp $
    struct ioc_toc_header tochdr;
  } mp_vcd_priv_t;
  
-@@ -209,8 +208,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
+@@ -236,8 +235,8 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
    sc.cmd[9] = 1 << 4; // user data only
    sc.cmd[10] = 0;     // no subchannel
    sc.cmdlen = 12;
@@ -24,15 +24,14 @@ $NetBSD: patch-an,v 1.2 2009/10/18 22:22:10 ahoka Exp $
    sc.senselen = sizeof(sc.sense);
    sc.flags = SCCMD_READ;
    sc.timeout = 10000;
-@@ -227,9 +226,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
+@@ -254,9 +253,9 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
  #else
    if (pread(vcd->fd,&vcd->buf,VCD_SECTOR_SIZE,vcd_get_msf(vcd)*VCD_SECTOR_SIZE)
       != VCD_SECTOR_SIZE) return 0;  // EOF?
--
--  memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
- #endif
-+  
-+  memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
++#endif
+ 
+   memcpy(mem,vcd->buf.data,VCD_SECTOR_DATA);
+-#endif
    vcd_inc_msf(vcd);
    return VCD_SECTOR_DATA;
  }
diff --git a/multimedia/mplayer-share/patches/patch-ar b/multimedia/mplayer-share/patches/patch-ar
index 18d142ec744..1e406b3eddf 100644
--- a/multimedia/mplayer-share/patches/patch-ar
+++ b/multimedia/mplayer-share/patches/patch-ar
@@ -2,9 +2,9 @@ $NetBSD$
 
 Fix for SA26157.
 
---- stream/realrtsp/real.c.orig	2009-09-02 12:55:36.000000000 +0200
+--- stream/realrtsp/real.c.orig	2010-12-03 19:52:10.000000000 +0000
 +++ stream/realrtsp/real.c
-@@ -369,6 +369,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_sess
+@@ -370,6 +370,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_sess
  #endif
    size+=2;
  
diff --git a/multimedia/mplayer-share/patches/patch-as b/multimedia/mplayer-share/patches/patch-as
deleted file mode 100644
index f4b3b1a84c3..00000000000
--- a/multimedia/mplayer-share/patches/patch-as
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-as,v 1.1 2011/11/02 16:35:15 drochner Exp $
-
-CVE-2011-3362
-
---- libavcodec/cavsdec.c.orig	2010-08-03 20:59:00.000000000 +0000
-+++ libavcodec/cavsdec.c
-@@ -115,7 +115,8 @@ static inline int get_ue_code(GetBitCont
- static int decode_residual_block(AVSContext *h, GetBitContext *gb,
-                                  const struct dec_2dvlc *r, int esc_golomb_order,
-                                  int qp, uint8_t *dst, int stride) {
--    int i, level_code, esc_code, level, run, mask;
-+    int i, esc_code, level, mask;
-+    unsigned int level_code, run;
-     DCTELEM level_buf[65];
-     uint8_t run_buf[65];
-     DCTELEM *block = h->block;
diff --git a/multimedia/mplayer-share/patches/patch-libao2_ao_sun.c b/multimedia/mplayer-share/patches/patch-libao2_ao_sun.c
index b0a55e6a56c..73be107f440 100644
--- a/multimedia/mplayer-share/patches/patch-libao2_ao_sun.c
+++ b/multimedia/mplayer-share/patches/patch-libao2_ao_sun.c
@@ -1,6 +1,9 @@
-$NetBSD: patch-libao2_ao_sun.c,v 1.1 2011/10/24 13:06:05 jmcneill Exp $
+$NetBSD: patch-libao2_ao_sun.c,v 1.2 2012/06/11 13:41:13 wiz Exp $
 
---- libao2/ao_sun.c.orig	2010-02-20 21:02:49.000000000 +0000
+If AUDIO_GETBUFINFO is available, use it whenever possible in preference
+to AUDIO_GETINFO. This should reduce playback CPU usage.
+
+--- libao2/ao_sun.c.orig	2011-07-24 23:55:39.000000000 +0000
 +++ libao2/ao_sun.c
 @@ -40,6 +40,10 @@
  #include <stropts.h>
@@ -13,25 +16,25 @@ $NetBSD: patch-libao2_ao_sun.c,v 1.1 2011/10/24 13:06:05 jmcneill Exp $
  #include "config.h"
  #include "mixer.h"
  
-@@ -164,7 +168,7 @@ static int realtime_samplecounter_availa
+@@ -162,7 +166,7 @@ static int realtime_samplecounter_availa
  	goto error;
      }
  
 -    if (ioctl(fd, AUDIO_GETINFO, &info)) {
 +    if (ioctl(fd, AUDIO_GETBUFINFO, &info)) {
- 	if ( mp_msg_test(MSGT_AO,MSGL_V) )
- 	    perror("rtsc: GETINFO1");
+         perror("rtsc: GETINFO1");
  	goto error;
-@@ -186,7 +190,7 @@ static int realtime_samplecounter_availa
+     }
+@@ -183,7 +187,7 @@ static int realtime_samplecounter_availa
  	if (usec_delay > 200000)
  	    break;
  
 -	if (ioctl(fd, AUDIO_GETINFO, &info)) {
 +	if (ioctl(fd, AUDIO_GETBUFINFO, &info)) {
- 	    if ( mp_msg_test(MSGT_AO,MSGL_V) )
- 		perror("rtsc: GETINFO2 failed");
+             perror("rtsc: GETINFO2 failed");
  	    goto error;
-@@ -650,7 +654,7 @@ static int get_space(void){
+ 	}
+@@ -645,7 +649,7 @@ static int get_space(void){
      }
  #endif
  
@@ -40,7 +43,7 @@ $NetBSD: patch-libao2_ao_sun.c,v 1.1 2011/10/24 13:06:05 jmcneill Exp $
  #if !defined (__OpenBSD__) && !defined(__NetBSD__)
      if (queued_bursts - info.play.eof > 2)
  	return 0;
-@@ -684,7 +688,7 @@ static int play(void* data,int len,int f
+@@ -681,7 +685,7 @@ static int play(void* data,int len,int f
  // return: delay in seconds between first and last sample in buffer
  static float get_delay(void){
      audio_info_t info;
diff --git a/multimedia/mplayer-share/patches/patch-ag b/multimedia/mplayer-share/patches/patch-sub_osd.c
index cd4392f751b..0c96b434adf 100644
--- a/multimedia/mplayer-share/patches/patch-ag
+++ b/multimedia/mplayer-share/patches/patch-sub_osd.c
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.6 2009/10/19 00:13:07 ahoka Exp $
+$NetBSD: patch-sub_osd.c,v 1.1 2012/06/11 13:41:13 wiz Exp $
 
---- libvo/osd.c.orig	2009-04-08 22:21:21.000000000 +0200
-+++ libvo/osd.c
+--- sub/osd.c.orig	2010-10-27 17:53:24.000000000 +0000
++++ sub/osd.c
 @@ -29,6 +29,11 @@
  #include <inttypes.h>
  #include "cpudetect.h"
diff --git a/multimedia/mplayer-share/patches/patch-ah b/multimedia/mplayer-share/patches/patch-sub_subreader.c
index 8e1d2825af3..da5c9464ad5 100644
--- a/multimedia/mplayer-share/patches/patch-ah
+++ b/multimedia/mplayer-share/patches/patch-sub_subreader.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2011/10/18 16:04:36 drochner Exp $
+$NetBSD: patch-sub_subreader.c,v 1.1 2012/06/11 13:41:13 wiz Exp $
 
---- subreader.c.orig	2010-09-11 11:11:10.000000000 +0000
-+++ subreader.c
-@@ -92,10 +92,10 @@ static int eol(char p) {
+--- sub/subreader.c.orig	2012-05-21 19:17:55.000000000 +0000
++++ sub/subreader.c
+@@ -94,10 +94,10 @@ static int eol(char p) {
  /* Remove leading and trailing space */
  static void trail_space(char *s) {
  	int i = 0;
@@ -15,16 +15,7 @@ $NetBSD: patch-ah,v 1.5 2011/10/18 16:04:36 drochner Exp $
  }
  
  static char *stristr(const char *haystack, const char *needle) {
-@@ -171,6 +171,8 @@ static subtitle *sub_read_line_sami(stre
- 	    break;
- 
- 	case 3: /* get all text until '<' appears */
-+	    if (p - text >= LINE_LEN)
-+		sami_add_line(current, text, &p);
- 	    if (*s == '\0') break;
- 	    else if (!strncasecmp (s, "<br>", 4)) {
-                 sami_add_line(current, text, &p);
-@@ -723,7 +725,7 @@ static subtitle *sub_read_line_pjs(strea
+@@ -742,7 +742,7 @@ static subtitle *sub_read_line_pjs(strea
      if (!stream_read_line (st, line, LINE_LEN, utf16))
  	return NULL;
      /* skip spaces */
@@ -33,17 +24,17 @@ $NetBSD: patch-ah,v 1.5 2011/10/18 16:04:36 drochner Exp $
      /* allow empty lines at the end of the file */
      if (*s==0)
  	return NULL;
-@@ -776,7 +778,7 @@ static subtitle *sub_read_line_mpsub(str
+@@ -795,7 +795,7 @@ static subtitle *sub_read_line_mpsub(str
  			else return current;
  		}
  		p=line;
 -		while (isspace(*p)) p++;
-+		while (isspace(*(unsigned char*)p)) p++;
++		while (isspace((unsigned char)*p)) p++;
  		if (eol(*p) && num > 0) return current;
  		if (eol(*p)) return NULL;
  
-@@ -1822,18 +1824,18 @@ char * strreplace( char * in,char * what
- static void strcpy_trim(char *d, char *s)
+@@ -1830,18 +1830,18 @@ char * strreplace( char * in,char * what
+ static void strcpy_trim(char *d, const char *s)
  {
      // skip leading whitespace
 -    while (*s && isspace(*s)) {
@@ -64,8 +55,8 @@ $NetBSD: patch-ah,v 1.5 2011/10/18 16:04:36 drochner Exp $
  	    s++;
  	}
  	if (*s == 0) break;
-@@ -1872,7 +1874,7 @@ static void strcpy_get_ext(char *d, char
- static int whiteonly(char *s)
+@@ -1885,7 +1885,7 @@ static void strcpy_get_ext(char *d, cons
+ static int whiteonly(const char *s)
  {
      while (*s) {
 -	if (!isspace(*s)) return 0;
diff --git a/multimedia/mplayer-share/patches/patch-vb b/multimedia/mplayer-share/patches/patch-vb
deleted file mode 100644
index e3709594dfa..00000000000
--- a/multimedia/mplayer-share/patches/patch-vb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-vb,v 1.4 2010/09/16 18:56:12 wiz Exp $
-
---- stream/tvi_v4l2.c.orig	2010-08-03 15:55:17.000000000 +0000
-+++ stream/tvi_v4l2.c
-@@ -49,8 +49,12 @@ known issues:
- #ifdef HAVE_SYS_SYSINFO_H
- #include <sys/sysinfo.h>
- #endif
-+#ifdef __linux__
- #include <linux/types.h>
- #include <linux/videodev2.h>
-+#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/videoio.h>
-+#endif
- #include "mp_msg.h"
- #include "libmpcodecs/img_format.h"
- #include "libmpcodecs/dec_teletext.h"
diff --git a/multimedia/mplayer-share/patches/patch-ve_x264 b/multimedia/mplayer-share/patches/patch-ve_x264
index d46d92911d9..3a29428f8c2 100644
--- a/multimedia/mplayer-share/patches/patch-ve_x264
+++ b/multimedia/mplayer-share/patches/patch-ve_x264
@@ -1,8 +1,8 @@
-$NetBSD: patch-ve_x264,v 1.1 2009/10/18 22:22:10 ahoka Exp $
+$NetBSD: patch-ve_x264,v 1.2 2012/06/11 13:41:13 wiz Exp $
 
---- libmpcodecs/ve_x264.c.orig	2009-09-23 14:26:44.000000000 +0200
+--- libmpcodecs/ve_x264.c.orig	2011-04-28 13:45:16.000000000 +0000
 +++ libmpcodecs/ve_x264.c
-@@ -198,8 +198,13 @@ static int control(struct vf_instance_s*
+@@ -204,8 +204,13 @@ static int control(struct vf_instance *v
      h264_module_t *mod=(h264_module_t*)vf->priv;
      switch(request){
          case VFCTRL_FLUSH_FRAMES: