RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge svn changes up to r28348

This commit is contained in:
Uoti Urpala 2009-01-23 20:56:50 +02:00
parent 79e1aa7cc7 39b7c1576d
commit 0406d95120
13 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOCS/man/fr/mplayer.1
View File

@ -1,4 +1,4 @@
.\" synced with r28279
.\" synced with r28341
.\" Encoding: iso-8859-1
.\" MPlayer (C) 2000-2009 MPlayer Team
.\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@ -3738,7 +3738,8 @@ pilote de sortie vid
.PD 0
.RSs
.IPs device_id=<numéro>
Choisir le moniteur à utiliser en plein-écran.
Choisir le moniteur à utiliser en plein-écran (par défaut\ : -1).
La valeur -1 laisse la vidéo sur le même écran.
.IPs shared_buffer
Écrit la sortie dans un tampon partagé au lieu de l'afficher, et essaye
d'établir une NSConnection avec une IHM existante.

7
DOCS/tech/mirrors/mirror_howto.txt
View File

@ -160,15 +160,13 @@ Setting up a webserver
Set up Apache or whatever web server you prefer. We just have static pages,
so no fancy configuration is necessary. However, we need a few aliases so that
links on our pages work correctly. /MPlayer and /DOCS should redirect to the
directory with the downloadable files and /homepage should redirect to the
directory with the HTML pages.
directory with the downloadable files.
Here is an example stanza to paste into your Apache configuration:
<VirtualHost www#.mplayerhq.hu>
DocumentRoot /path/to/htdocs
Options FollowSymLinks Indexes
Alias /homepage /path/to/htdocs
Alias /MPlayer /path/to/MPlayer
Alias /DOCS /path/to/MPlayer/DOCS
AddDefaultCharset off
@ -177,7 +175,6 @@ Here is an example stanza to paste into your Apache configuration:
<VirtualHost www.mplayerhq.hu>
DocumentRoot /path/to/htdocs
Options FollowSymLinks Indexes
Alias /homepage /path/to/htdocs
Alias /MPlayer /path/to/MPlayer
Alias /DOCS /path/to/MPlayer/DOCS
AddDefaultCharset off
@ -205,7 +202,7 @@ both for your mirror address (www#.mplayerhq.hu) and the DNS round-robin
address (www.mplayerhq.hu):
- The virtual host is reachable by its address.
- The subdirectories MPlayer, DOCS and homepage work.
- The MPlayer and DOCS subdirectories work.
- The man pages and documentation are served with the correct content-type.
Try Russian or Chinese, you will notice breakage immediately.

2
configure vendored
View File

@ -523,7 +523,7 @@ _libavcodec_a=auto
_libamr_nb=auto
_libamr_wb=auto
_libavdecoders_all=`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
_libavdecoders=` echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER// -e s/H264_VDPAU_DECODER// -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER//`
_libavdecoders=` echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER// -e s/H264_VDPAU_DECODER// -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// `
_libavencoders_all=`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
_libavencoders=` echo $_libavencoders_all | sed 's/ LIB[A-Z0-9_]*_ENCODER//g'`
_libavparsers_all=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`

12
etc/codecs.conf
View File

@ -826,6 +826,7 @@ videocodec ffodivx
fourcc FFDS
fourcc DCOD,MVXM,EM4A,PM4V
fourcc M4T3,DMK2,DIGI,INMC
fourcc EPHV
driver ffmpeg
dll mpeg4 ;opendivx
out YV12,I420,IYUV
@ -876,6 +877,7 @@ videocodec xvid
fourcc FFDS
fourcc DCOD,MVXM,EM4A,PM4V
fourcc M4T3,DMK2,DIGI,INMC
fourcc EPHV
format 0x10000004 ; mpeg 4 es
driver xvid
out YV12
@ -1319,6 +1321,7 @@ videocodec ffh263
fourcc H263,U263,h263,X263,M263
fourcc viv1 h263
fourcc s263,S263
fourcc T263
fourcc D263 ; DEC H263
fourcc L263 ; Lead H263
fourcc ILVR ; ITU H263+
@ -1726,6 +1729,15 @@ videocodec midivid3
dll "MV3.dll"
out BGR24,BGR16
videocodec moyea
info "Moyea Flash to Video Converter"
comment "requires zlib1.dll" ; c7d4d685a0af2a09cbc21cb474358595
status working
fourcc MFZ0
driver vfw
dll "MyFlashZip0.ax"
out BGR24 flip
videocodec nsvideo
info "Power VideoWorks video"
status working

1
libmpdemux/demux_ts.c
View File

@ -1762,6 +1762,7 @@ static int parse_pat(ts_priv_t * priv, int is_start, unsigned char *buff, int si
priv->pat.progs[idx].id = progid;
priv->pat.progs[idx].pmt_pid = ((base[2] & 0x1F) << 8) | base[3];
mp_msg(MSGT_DEMUX, MSGL_V, "PROG: %d (%d-th of %d), PMT: %d\n", priv->pat.progs[idx].id, i+1, entries, priv->pat.progs[idx].pmt_pid);
mp_msg(MSGT_IDENTIFY, MSGL_V, "PROGRAM_ID=%d (0x%02X), PMT_PID: %d(0x%02X)\n", progid, priv->pat.progs[idx].pmt_pid );
}
return 1;

4
libswscale/swscale.c
View File

@ -458,6 +458,10 @@ const char *sws_format_name(enum PixelFormat format)
return "vdpau_mpeg1";
case PIX_FMT_VDPAU_MPEG2:
return "vdpau_mpeg2";
case PIX_FMT_VDPAU_WMV3:
return "vdpau_wmv3";
case PIX_FMT_VDPAU_VC1:
return "vdpau_vc1";
default:
return "Unknown format";
}

2
libvo/vo_md5sum.c
View File

@ -3,7 +3,7 @@
/*
* md5sum video output driver
*
* Written by Ivo van Poorten. (C) Copyright 2004, 2005, 2006.
* Copyright (C) 2004, 2005, 2006 Ivo van Poorten
*
* This file is part of MPlayer.
*

2
libvo/vo_sdl.c
View File

@ -3,7 +3,7 @@
*
* (was video_out_sdl.c from OMS project/mpeg2dec -> http://linuxvideo.org)
*
* Copyright (C) Ryan C. Gordon <icculus@lokigames.com> - April 22, 2000.
* Copyright (C) Ryan C. Gordon <icculus@lokigames.com> - April 22, 2000
*
* Copyright (C) Felix Buenemann <atmosfear@users.sourceforge.net> - 2001
*

2
vidix/cyberblade_regs.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 1992-2000 by Alan Hourihane, Wigan, England.
* Copyright 1992-2000 by Alan Hourihane, Wigan, England
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that

2
vidix/dhahelperwin/dhahelper.c
View File

@ -1,7 +1,7 @@
/*
* direct hardware access under Windows NT/2000/XP
*
* Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>.
* Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>
* Patched to compile with MinGW by Kevin Kofler:
* Copyright (c) 2007 Kevin Kofler
*

2
vidix/dhahelperwin/dhahelper.h
View File

@ -1,7 +1,7 @@
/*
* direct hardware access under Windows NT/2000/XP
*
* Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>.
* Copyright (c) 2004 Sascha Sommer <saschasommer@freenet.de>
*
* This file is part of MPlayer.
*

4
vidix/sis_bridge.c
View File

@ -2,9 +2,9 @@
* VIDIX driver for SiS chipsets.
* Video bridge detection for SiS 300 and 310/325 series.
*
* Copyright (C) 2003 Jake Page, Sugar Media.
* Copyright (C) 2003 Jake Page, Sugar Media
* Based on SiS Xv driver
* Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria.
* Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria
*
* This file is part of MPlayer.
*

4
vidix/sis_vid.c
View File

@ -2,8 +2,8 @@
* VIDIX driver for SiS chipsets.
* Based on SiS Xv driver
*
* Copyright (C) 2003 Jake Page, Sugar Media.
* Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria.
* Copyright (C) 2003 Jake Page, Sugar Media
* Copyright 2002-2003 by Thomas Winischhofer, Vienna, Austria
* 2003/10/08 integrated into mplayer/vidix architecture -- Alex Beregszaszi
*
* This file is part of MPlayer.