From eacccfafc83bf08d14f9ddee75c34739b647f238 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 4 Feb 2010 16:56:28 +0000
Subject: [PATCH 1/3] Clarify -vo vdpau:pullup

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30503 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/man/en/mplayer.1 | 4 +++-
 libvo/vo_vdpau.c      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 196ac51794..611a7d6e7a 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3528,7 +3528,9 @@ Makes temporal deinterlacers operate both on luma and chroma (default).
 Use nochroma\-deint to solely use luma and speed up advanced deinterlacing.
 Useful with slow video memory.
 .IPs pullup
-Try to apply inverse telecine, needs motion adaptive temporal deinterlacing.
+Try to skip deinterlacing for progressive frames, useful for watching
+telecined content, needs fast video hardware for high resolutions.
+Only works with motion adaptive temporal deinterlacing.
 .IPs colorspace
 Select the color space for YUV to RGB conversion.
 In general BT.601 should be used for standard definition (SD) content and
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 2ee7cccf9b..4249dc4840 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -1203,7 +1203,8 @@ static const char help_msg[] =
     "    Operate on luma and chroma when using temporal deinterlacing (default)\n"
     "    Use nochroma-deint to speed up temporal deinterlacing\n"
     "  pullup\n"
-    "    Try to apply inverse-telecine (needs temporal deinterlacing)\n"
+    "    Try to skip deinterlacing for progressive frames
+    "    (only works with temporal deinterlacing, useful for telecined content)\n"
     "  denoise\n"
     "    Apply denoising, argument is strength from 0.0 to 1.0\n"
     "  sharpen\n"

From 212eb494ff3c466952c6fd49ff926f71f4d4d2e6 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 4 Feb 2010 17:27:38 +0000
Subject: [PATCH 2/3] 100l: Fix compilation (broken by me).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30504 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_vdpau.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 4249dc4840..feef2f7d43 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -1203,7 +1203,7 @@ static const char help_msg[] =
     "    Operate on luma and chroma when using temporal deinterlacing (default)\n"
     "    Use nochroma-deint to speed up temporal deinterlacing\n"
     "  pullup\n"
-    "    Try to skip deinterlacing for progressive frames
+    "    Try to skip deinterlacing for progressive frames"
     "    (only works with temporal deinterlacing, useful for telecined content)\n"
     "  denoise\n"
     "    Apply denoising, argument is strength from 0.0 to 1.0\n"

From 0b6de5c37e66203050167470e1b7bb1bda4f368f Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 4 Feb 2010 21:17:46 +0000
Subject: [PATCH 3/3] Enable RTSP and SDP demuxers if network support is
 enabled, they can now be used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30505 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index f0bd254300..f570c63081 100755
--- a/configure
+++ b/configure
@@ -559,7 +559,7 @@ _libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' liba
 # Disable all hardware accelerators for now.
 _libavhwaccels=
 _libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
-_libavdemuxers=$(echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/AVISYNTH_DEMUXER//)
+_libavdemuxers=$(echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//)
 _libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
 _libavmuxers=$(echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER//)
 _libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
@@ -3355,6 +3355,7 @@ else
   def_network='#undef CONFIG_NETWORK'
   _ftp=no
   _libavprotocols=$(echo $_libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//)
+  _libavdemuxers=$(echo $_libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//)
 fi
 echores "$_network"