Merge svn changes up to r30848

Author: Uoti Urpala

DOCS/man/en/mplayer.1

@@ -3114,13 +3114,16 @@ Fixes fullscreen switching on OpenBox 1.x.
 .PD 1
 .
 .TP
-.B \-geometry x[%][:y[%]] or [WxH][+x+y]
+.B \-geometry x[%][:y[%]] or [WxH][+-x+-y]
 Adjust where the output is on the screen initially.
 The x and y specifications are in pixels measured from the top-left of the
 screen to the top-left of the image being displayed, however if a percentage
 sign is given after the argument it turns the value into a percentage of the
 screen size in that direction.
-It also supports the standard X11 \-geometry option format.
+It also supports the standard X11 \-geometry option format, in which e.g.
++10-50 means "place 10 pixels from the left border and 50 pixels from the lower
+border" and "--20+-10" means "place 20 pixels beyond the right and 10 pixels
+beyond the top border".
 If an external window is specified using the \-wid option, then the x and
 y coordinates are relative to the top-left corner of the window rather
 than the screen.

DOCS/man/zh_CN/mplayer.1

@@ -1,4 +1,4 @@
-.\" sync with en/mplayer.1 rev. 30677
+.\" sync with en/mplayer.1 rev. 30822
 .\" Encoding: UTF-8
 .\" Reminder of hard terms which need better/final solution later:
 .\"   /capture; playtree in parent list; colorkey; retrace; desync; downmix;
@@ -2676,11 +2676,11 @@ OS/2 KAI 音频输出驱动
 .PD 0
 .RSs
 .IPs uniaud
-强制使用 UNIAUD 模式
+强制使用 UNIAUD 模式。
 .IPs dart
-强制使用 DART 模式
+强制使用 DART 模式。
 .IPs (no)share
-以共享或独占模式打开音频
+以共享或独占模式打开音频。
 .IPs bufsize=<size>
 设置缓冲大小为 <size>，以采样数为单位（默认值：2048）。
 .RE
@@ -2946,13 +2946,14 @@ VESA 帧缓冲不支持改变模式。
 .PD 1
 .
 .TP
-.B \-geometry x[%][:y[%]] or [WxH][+x+y]
+.B \-geometry x[%][:y[%]] 或 [WxH][+-x+-y]
 调整屏幕输出的初始位置。
 x 和 y 代表从屏幕左上角到显示图像左上角的距离(以像素为单位)。
 不过如果在参数值后有百分号记号, 参数值就变为该方向上的屏幕尺寸的百分数。
-它也支持标准 X11 的 \-geometry 选项格式。
-如果使用 \-wid 选项指定了外部窗口,
-那么 x 和 y 坐标是相对于窗口而不是屏幕的左上角。
+它也支持标准 X11 的 \-geometry 选项格式。在这种方式下，例如，‘+10-50’表示“放在距左
+边界 10 个像素，距下边界 50 个像素的地方”，而‘--20+-10’表示“放在越出右边界 20 个像
+素，越出上边界 10 个像素的地方。”
+如果使用 \-wid 选项指定了外部窗口，那么 x 和 y 坐标是相对于窗口而不是屏幕的左上角。
 坐标是相对于 \-xineramascreen 选项给出的屏幕，该屏幕用于完全支持 \-xineramascreen 的
 视频输出的驱动（direct3d、gl、gl2、vdpau、x11、xv、xvmc、corevideo）。
 The coordinates are relative to the screen given with \-xineramascreen for
@@ -5427,6 +5428,10 @@ Completely empties the filter list.
 计数值,用以决定多少帧后 cropdetect 将重置先前侦测到的最大视频区域，并重
 新侦测当前的最优切割区域。该选项在电视台台标影响了视频区域时可能有用。0 
 表示从不重置而是返回播放过程中遇到的最大区域。（默认值：0）。
+计数值，用以决定多少帧后 cropdetect 将重置先前侦测到的最大视频区域，并
+重新开始侦测当前的最优切割区域（默认值：0）。
+该选项在频道台标破坏了视频区域的情况下很有效。
+0 代表从不重置并返回整个播放过程中遇到的最大视频区域。
 .RE
 .PD 1
 .

DOCS/tech/mirrors/update_mplayer_rsync

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # MPlayer mirroring script
 # $Id$
 
@@ -10,7 +10,7 @@ MAILADR=<report_mail_to_adr>
 #TMPDIR = /tmp
 #export TMPDIR
 
-TMPFILE=`mktemp -t mplayer.XXXXXXXXXXX`
+TMPFILE=$(mktemp -t mplayer.XXXXXXXXXXX)
 
 # Check to see if another sync is in progress
 if lockfile -! -l 43200 -r 0 "$LOCK"; then
@@ -30,9 +30,8 @@ rsync -pxlrHtWv --delete --delete-after --exclude '/benchmark' \
       --exclude '/old_stuff' --exclude '/tests' rsync.mplayerhq.hu::ftp/ \
       MPlayer  >> $TMPFILE 2>&1
 
-x=`wc -l $TMPFILE | awk '{print $1}'`
-if [ "$x" -ne "10" ]
-then
+x=$(wc -l $TMPFILE | awk '{print $1}')
+if [ "$x" -ne "10" ]; then
   mailx -s "MPlayer mirror" $MAILADR < $TMPFILE
 fi
 rm -f $TMPFILE

DOCS/tech/nut.txt

@@ -21,10 +21,14 @@ http://svnbook.org/
 
 For more information about the Subversion project, visit
 
-http://subversion.tigris.org/
+http://subversion.apache.org/
 
 Consult these resources whenever you have problems, they are quite exhaustive.
 
+You do not need a special checkout that works through ssh or similar in order
+to be able to commit changes. All you need is the username and password pair
+that you received from the MPlayer Subversion server admin.
+
 What follows now is a basic introduction to Subversion and some MPlayer-specific
 guidelines. Read it at least once, if you are granted commit privileges to the
 MPlayer project you are expected to be familiar with these rules.

DOCS/tech/oggless-xiph-codecs.txt

@@ -1754,10 +1754,6 @@ If you want to do software transcoding you should have at least a 1GHz CPU.
 <para>
 Configure should detect your DVB card. If it did not, force detection with
 <screen>./configure --enable-dvb</screen>
-If you have ost headers at a non-standard path, set the path with
-<screen>
-./configure --with-extraincdir=<replaceable>DVB source directory</replaceable>/ost/include
-</screen>
 Then compile and install as usual.</para>
 
 <formalpara><title>USAGE</title>

DOCS/tech/svn-howto.txt

@@ -353,7 +353,6 @@ Video output:
   --enable-ivtv            enable IVTV TV-Out video output [autodetect]
   --enable-v4l2            enable V4L2 Decoder audio/video output [autodetect]
   --enable-dvb             enable DVB video output [autodetect]
-  --enable-dvbhead         enable DVB video output (HEAD version) [autodetect]
   --enable-mga             enable mga_vid video output [autodetect]
   --enable-xmga            enable mga_vid X11 video output [autodetect]
   --enable-xv              enable Xv video output [autodetect]
@@ -551,7 +550,6 @@ _svga=auto
 _vesa=auto
 _fbdev=auto
 _dvb=auto
-_dvbhead=auto
 _dxr2=auto
 _dxr3=auto
 _ivtv=auto
@@ -921,8 +919,6 @@ for ac_option do
   --disable-fbdev)      _fbdev=no       ;;
   --enable-dvb)         _dvb=yes        ;;
   --disable-dvb)        _dvb=no         ;;
-  --enable-dvbhead)     _dvbhead=yes    ;;
-  --disable-dvbhead)    _dvbhead=no     ;;
   --enable-dxr2)        _dxr2=yes       ;;
   --disable-dxr2)       _dxr2=no        ;;
   --enable-dxr3)        _dxr3=yes       ;;
@@ -3827,6 +3823,17 @@ fi
 echores "$_setenv"
 
 
+echocheck "setmode()"
+_setmode=no
+def_setmode='#define HAVE_SETMODE 0'
+cat > $TMPC << EOF
+#include <io.h>
+int main(void) { setmode(0, 0); return 0; }
+EOF
+cc_check && _setmode=yes && def_setmode='#define HAVE_SETMODE 1'
+echores "$_setmode"
+
+
 if sunos; then
 echocheck "sysi86()"
 cat > $TMPC << EOF
@@ -4707,72 +4714,34 @@ cat >$TMPC << EOF
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
-#include <ost/dmx.h>
-#include <ost/frontend.h>
-#include <ost/sec.h>
-#include <ost/video.h>
-#include <ost/audio.h>
-int main(void) {return 0;}
-EOF
-  for _inc_tmp in "" "-I/usr/src/DVB/ost/include" ; do
-    cc_check $_inc_tmp && _dvb=yes && \
-     extra_cflags="$extra_cflags $_inc_tmp" && break
-  done
-fi
-echores "$_dvb"
-if test "$_dvb" = yes ; then
-  def_dvb='#define CONFIG_DVB 1'
-  def_dvbin='#define CONFIG_DVBIN 1'
-  _aomodules="mpegpes(dvb) $_aomodules"
-  _vomodules="mpegpes(dvb) $_vomodules"
-fi
-
-echocheck "DVB HEAD"
-if test "$_dvbhead" = auto ; then
-  _dvbhead=no
-
-cat >$TMPC << EOF
-#include <poll.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
 int main(void) {return 0;}
 EOF
   for _inc_tmp in "" "-I/usr/src/DVB/include" ; do
-    cc_check $_inc_tmp && _dvbhead=yes && \
+    cc_check $_inc_tmp && _dvb=yes && \
       extra_cflags="$extra_cflags $_inc_tmp" && break
   done
 fi
-echores "$_dvbhead"
-if test "$_dvbhead" = yes ; then
+echores "$_dvb"
+if test "$_dvb" = yes ; then
+  _dvbin=yes
+  _inputmodules="dvb $_inputmodules"
   def_dvb='#define CONFIG_DVB 1'
-  def_dvb_head='#define CONFIG_DVB_HEAD 1'
   def_dvbin='#define CONFIG_DVBIN 1'
   _aomodules="mpegpes(dvb) $_aomodules"
   _vomodules="mpegpes(dvb) $_vomodules"
-fi
-
-if test "$_dvbhead" = no && test "$_dvb" = no ; then
+else
+  _dvbin=no
+  _noinputmodules="dvb $_noinputmodules"
   def_dvb='#undef CONFIG_DVB'
-  def_dvb_head='#undef CONFIG_DVB_HEAD'
   def_dvbin='#undef CONFIG_DVBIN '
   _aomodules="mpegpes(file) $_aomodules"
   _vomodules="mpegpes(file) $_vomodules"
 fi
 
-if test "$_dvb" = yes || test "$_dvbhead" = yes ; then
-    _dvbin=yes
-    _inputmodules="dvb $_inputmodules"
-else
-    _dvbin=no
-    _noinputmodules="dvb $_noinputmodules"
-fi
-
 
 if darwin; then
 
@@ -5884,7 +5853,7 @@ fi
 echocheck "VCD support"
 if test "$_vcd" = auto; then
   _vcd=no
-  if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || darwin || sunos; then
+  if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || darwin || sunos || os2; then
     _vcd=yes
   elif mingw32; then
     cat > $TMPC << EOF
@@ -8241,6 +8210,7 @@ $def_nanosleep
 $def_posix_select
 $def_select
 $def_setenv
+$def_setmode
 $def_shm
 $def_strsep
 $def_swab
@@ -8445,7 +8415,6 @@ $def_directfb
 $def_directfb_version
 $def_directx
 $def_dvb
-$def_dvb_head
 $def_dvbin
 $def_dxr2
 $def_dxr3

DOCS/xml/en/video.xml

@@ -30,11 +30,6 @@
 
 #include "config.h"
 
-#ifdef CONFIG_DVB
-#include <poll.h>
-#include <sys/ioctl.h>
-#endif
-
 #include "audio_out.h"
 #include "audio_out_internal.h"
 
@@ -46,14 +41,11 @@
 #include "help_mp.h"
 
 #ifdef CONFIG_DVB
-#ifndef CONFIG_DVB_HEAD
-#include <ost/audio.h>
-audioMixer_t dvb_mixer={255,255};
-#else
+#include <poll.h>
+#include <sys/ioctl.h>
 #include <linux/dvb/audio.h>
 audio_mixer_t dvb_mixer={255,255};
 #endif
-#endif
 
 #define true 1
 #define false 0
@@ -116,13 +108,8 @@ static int freq_id=0;
 static int init_device(int card)
 {
 	char ao_file[30];
-#ifndef CONFIG_DVB_HEAD
-	mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/audio\n");
-	sprintf(ao_file, "/dev/ost/audio");
-#else
 	mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/dvb/adapter%d/audio0\n", card);
 	sprintf(ao_file, "/dev/dvb/adapter%d/audio0", card);
-#endif
 	if((vo_mpegpes_fd2 = open(ao_file,O_RDWR|O_NONBLOCK)) < 0)
 	{
         	mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO DEVICE: %s\n", strerror(errno));

configure

@@ -55,7 +55,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
 
 // init driver
 static int init(sh_video_t *sh){
-    unsigned int out_fmt=sh->codec->outfmt[sh->outfmtidx];
+    unsigned int out_fmt=sh->codec->outfmt[0];
     struct context *ctx;
     void *decoder;
     if(!(decoder=DMO_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){
@@ -64,6 +64,8 @@ static int init(sh_video_t *sh){
 	return 0;
     }
     if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,out_fmt)) return 0;
+    // mpcodecs_config_vo can change the format
+    out_fmt=sh->codec->outfmt[sh->outfmtidx];
     sh->context = ctx = calloc(1, sizeof(*ctx));
     ctx->decoder = decoder;
     switch(out_fmt){

libao2/ao_mpegpes.c

@@ -66,7 +66,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
 
 // init driver
 static int init(sh_video_t *sh){
-    unsigned int out_fmt=sh->codec->outfmt[sh->outfmtidx];
+    unsigned int out_fmt=sh->codec->outfmt[0];
 
     /* Hack for VSSH codec: new dll can't decode old files
      * In my samples old files have no extradata, so use that info
@@ -81,6 +81,8 @@ static int init(sh_video_t *sh){
 	return 0;
     }
     if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,out_fmt)) return 0;
+    // mpcodecs_config_vo can change the format
+    out_fmt=sh->codec->outfmt[sh->outfmtidx];
     switch(out_fmt){
     case IMGFMT_YUY2:
     case IMGFMT_UYVY: