summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-03-07 01:04:41 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-03-07 01:04:41 +0200
commite0172b96e3b6cc6a8b62ee5a52f780941a43de8b (patch)
treef652f6d15740667d5434e526db3fd12a0573aa0f
parent0c6f667896620943ee6ae899d6e36c3da5c98c54 (diff)
parent7e253f01715811e0c4f5f5b54317b098f2cd59d9 (diff)
downloadmpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.bz2
mpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.xz
Merge svn changes up to r28862
-rw-r--r--Changelog83
-rw-r--r--DOCS/man/en/mplayer.118
-rw-r--r--DOCS/man/fr/mplayer.171
-rw-r--r--DOCS/man/hu/mplayer.129
-rw-r--r--DOCS/man/ru/mplayer.123
-rw-r--r--DOCS/man/zh_CN/mplayer.1116
-rw-r--r--DOCS/tech/codecs-in.html52
-rw-r--r--DOCS/tech/svn-howto.txt4
-rw-r--r--DOCS/xml/fr/faq.xml362
-rw-r--r--DOCS/xml/fr/ports.xml99
-rw-r--r--DOCS/xml/fr/radio.xml36
-rw-r--r--Makefile40
-rw-r--r--TOOLS/subrip.c5
-rw-r--r--cfg-mplayer.h2
-rw-r--r--codec-cfg.c8
-rwxr-xr-xconfigure32
-rw-r--r--help/help_mp-bg.h2
-rw-r--r--help/help_mp-cs.h2
-rw-r--r--help/help_mp-de.h2
-rw-r--r--help/help_mp-dk.h2
-rw-r--r--help/help_mp-el.h2
-rw-r--r--help/help_mp-en.h2
-rw-r--r--help/help_mp-es.h2
-rw-r--r--help/help_mp-fr.h2
-rw-r--r--help/help_mp-hu.h2
-rw-r--r--help/help_mp-it.h2
-rw-r--r--help/help_mp-ja.h2
-rw-r--r--help/help_mp-ko.h2
-rw-r--r--help/help_mp-mk.h2
-rw-r--r--help/help_mp-nb.h2
-rw-r--r--help/help_mp-nl.h2
-rw-r--r--help/help_mp-pl.h2
-rw-r--r--help/help_mp-pt_BR.h2
-rw-r--r--help/help_mp-ro.h2
-rw-r--r--help/help_mp-ru.h2
-rw-r--r--help/help_mp-sk.h2
-rw-r--r--help/help_mp-sv.h2
-rw-r--r--help/help_mp-tr.h2
-rw-r--r--help/help_mp-uk.h642
-rw-r--r--help/help_mp-zh_CN.h2
-rw-r--r--help/help_mp-zh_TW.h2
-rw-r--r--liba52/a52.h3
-rw-r--r--liba52/liba52_changes.diff92
-rw-r--r--libaf/af_resample.c36
-rw-r--r--libao2/ao_alsa.c2
-rw-r--r--libao2/ao_alsa5.c2
-rw-r--r--libao2/ao_arts.c2
-rw-r--r--libao2/ao_dart.c334
-rw-r--r--libao2/ao_dsound.c4
-rw-r--r--libao2/ao_dxr2.c2
-rw-r--r--libao2/ao_esd.c2
-rw-r--r--libao2/ao_ivtv.c2
-rw-r--r--libao2/ao_jack.c2
-rw-r--r--libao2/ao_macosx.c2
-rw-r--r--libao2/ao_mpegpes.c2
-rw-r--r--libao2/ao_nas.c2
-rw-r--r--libao2/ao_null.c2
-rw-r--r--libao2/ao_openal.c2
-rw-r--r--libao2/ao_oss.c2
-rw-r--r--libao2/ao_pcm.c2
-rw-r--r--libao2/ao_pulse.c2
-rw-r--r--libao2/ao_sdl.c2
-rw-r--r--libao2/ao_sgi.c2
-rw-r--r--libao2/ao_sun.c2
-rw-r--r--libao2/ao_v4l2.c2
-rw-r--r--libao2/ao_win32.c95
-rw-r--r--libao2/audio_out.c48
-rw-r--r--libao2/audio_out.h2
-rw-r--r--libao2/audio_out_internal.h2
-rw-r--r--libass/ass.c4
-rw-r--r--libass/ass_bitmap.c43
-rw-r--r--libass/ass_bitmap.h2
-rw-r--r--libass/ass_cache.c50
-rw-r--r--libass/ass_cache.h21
-rw-r--r--libass/ass_render.c194
-rw-r--r--libass/ass_types.h1
-rw-r--r--libass/ass_utils.c11
-rw-r--r--libass/ass_utils.h1
-rw-r--r--libfaad2/local_changes.diff5
-rw-r--r--libfaad2/specrec.c3
-rw-r--r--libmpcodecs/vd_ffmpeg.c46
-rw-r--r--libmpdemux/demux_ts.c3
-rw-r--r--libmpeg2/libmpeg2_changes.diff231
-rw-r--r--libswscale/rgb2rgb.c13
-rw-r--r--libswscale/rgb2rgb_template.c83
-rw-r--r--libswscale/swscale.c4
-rw-r--r--libswscale/swscale_template.c31
-rw-r--r--libswscale/yuv2rgb.c5
-rw-r--r--libswscale/yuv2rgb_altivec.c10
-rw-r--r--libswscale/yuv2rgb_template.c2
-rw-r--r--libswscale/yuv2rgb_vis.c6
-rw-r--r--libvo/video_out.c2
-rw-r--r--libvo/video_out.h2
-rw-r--r--libvo/vo_gl.c79
-rw-r--r--libvo/vo_vdpau.c73
-rw-r--r--libvo/x11_common.c6
-rw-r--r--m_option.c29
-rw-r--r--m_option.h2
-rw-r--r--osdep/getch2-win.c21
-rw-r--r--osdep/getch2.c23
-rw-r--r--osdep/getch2.h24
-rw-r--r--osdep/gettimeofday.c18
-rw-r--r--osdep/glob-win.c18
-rw-r--r--osdep/glob.h18
-rw-r--r--osdep/keycodes.h22
-rw-r--r--osdep/macosx_finder_args.c18
-rw-r--r--osdep/mmap_anon.c18
-rw-r--r--osdep/mmap_anon.h18
-rw-r--r--osdep/mplayer.rc23
-rw-r--r--osdep/setenv.c20
-rw-r--r--osdep/shmem.c25
-rw-r--r--osdep/shmem.h18
-rw-r--r--osdep/strsep.c20
-rw-r--r--osdep/swab.c18
-rw-r--r--osdep/timer-linux.c21
-rw-r--r--osdep/timer-win2.c20
-rw-r--r--osdep/timer.h18
-rw-r--r--osdep/vsscanf.c22
-rw-r--r--subopt-helper.c13
-rw-r--r--subopt-helper.h5
-rw-r--r--tremor/tremor.diff10
-rwxr-xr-xversion.sh7
122 files changed, 2743 insertions, 981 deletions
diff --git a/Changelog b/Changelog
index 818fea087f..5cf0d4d533 100644
--- a/Changelog
+++ b/Changelog
@@ -1,8 +1,7 @@
MPlayer (1.0)
- rc3:
+ rc3: "StillAlive" March 1, 2009
Decoders:
- * Nellymoser audio decoding via lavc
* support for X8 frame (fixes "J-type picture is not supported" for WMV2)
* support for DTS WAV/DTS-CD passthrough by ad_hwac3
* Apple's raw YUV2 in MOV
@@ -10,8 +9,6 @@ MPlayer (1.0)
* video game codecs: BFI video, Playstation MDEC video, ADPCM XA audio,
EA Maxis XA ADPCM audio, RL2 video, Beam Software SIFF video, V.Flash PTX video
* AVOption support for libavcodec-based decoders
- * image decoders: Sun rasterfile, PCX image
- * MLP decoder via lavc
* use lavc ADPCM codecs by default
* support for progressive jpeg in ffmjpeg
* ACDSystems mjpeg (ACDV) via binary DLL and lavc
@@ -39,14 +36,15 @@ MPlayer (1.0)
* 10-bit video (v210) via Cinewave binary DLL
* Brooktree YUV 4:1:1 Raw (Y41P) via binary DLL
* many rare/obscure fourccs for known formats added
+ * lower priority for binary Linux rv3040 codecs due to bugs
Demuxers:
* -lavfdopts cryptokey allows decrypting MXF and ASF files
* support for wavpack in Matroska
- * demux_lavf permits program switching
* AVOption support for lavf demuxing
* prefer lavf musepack demuxer over libmpdemux
- * prefer lavf MOV demuxer over libmpdemux
+ * prefer lavf MOV demuxer over libmpdemux (use -demuxer mov for old behavior)
+ * support program switching in lavf demuxer
* support -slang in lavf demuxer
* support nosound switching in lavf demuxer
* support libass in lavf demuxer
@@ -54,6 +52,7 @@ MPlayer (1.0)
* support MOV subtitle format
* support for attachments in lavf demuxer
* support for chapters in lavf demuxer
+ * support seeking in multirate RealMedia files
* FLAC speedup in lavf demuxer
* MNG demuxer
@@ -70,19 +69,66 @@ MPlayer (1.0)
* DVD streams can switch angles
* DVD still menus are now supported via dvdnav://
* allow specifying the TV standard for each channel
+ * switch internal dvdread to libdvdread SVN external
FFmpeg/libavcodec:
- * DNxHD (SMPTE VC-3) encoder
- * H.264 speedup and PAFF decoding
+ * DNxHD encoder
+ * H.264 PAFF decoding
+ * Nellymoser ASAO decoder
+ * Beam Software SIFF demuxer and decoder
+ * libvorbis Vorbis decoding removed in favor of native decoder
+ * IntraX8 (J-Frame) subdecoder for WMV2 and VC-1
+ * Ogg (Vorbis only) muxer
+ * PC Paintbrush PCX decoder
+ * Sun Rasterfile decoder
+ * TechnoTrend PVA demuxer
+ * Linux Media Labs MPEG-4 (LMLM4) demuxer
+ * AVM2 (Flash 9) SWF muxer
+ * QT variant of IMA ADPCM encoder
+ * Ipod/Iphone compatible mp4 muxer
+ * Mimic decoder
+ * MSN TCP Webcam stream demuxer
+ * RL2 demuxer / decoder
+ * IFF demuxer
+ * 8SVX audio decoder
+ * BFI demuxer
+ * MAXIS EA XA (.xa) demuxer / decoder
+ * BFI video decoder
+ * OMA demuxer
+ * MLP/TrueHD decoder
+ * Electronic Arts CMV decoder
+ * Motion Pixels Video decoder
+ * Motion Pixels MVI demuxer
+ * removed animated GIF decoder/demuxer
+ * D-Cinema audio muxer
+ * Electronic Arts TGV decoder
+ * Apple Lossless Audio Codec (ALAC) encoder
+ * AAC decoder
+ * floating point PCM encoder/decoder
+ * MXF muxer
+ * E-AC-3 support added to AC-3 decoder
+ * Nellymoser ASAO encoder
+ * ASS and SSA demuxer and muxer
+ * liba52 wrapper removed
+ * SVQ3 watermark decoding support
+ * Speex decoding via libspeex
+ * Electronic Arts TGQ decoder
+ * RV30 and RV40 decoder
+ * QCELP / PureVoice decoder
+ * hybrid WavPack support
+ * R3D REDCODE demuxer
+ * Electronic Arts TQI decoder
+ * OpenJPEG based JPEG 2000 decoder
+ * NC (NC4600) cameras file demuxer
+ * MXF D-10 muxer
+ * Generic metadata API
+ * H.264 speedup and PAFF decoding (install Yasm for faster H264 decoding)
* correctly decode more of the H.264 conformance testsuite
- * Nellymoser audio codec
- * VC-1/WMV3 MMX optimizations
+ * VC-1/WMV3 decoder speedup
* VP3 decoder speedup
+ * VP6 decoder speedup
* Split-Radix FFT (speedup multiple audio codecs)
* MMX/SSE/ARM and other misc speedups
- * QCELP decoder
- * RV30 decoder
- * RV40 decoder
libmpeg2:
* enable Alpha/ARM optimizations in libmpeg2
@@ -98,7 +144,8 @@ MPlayer (1.0)
* Direct3D Windows video output driver added.
* factorize code in vo_wii
* removed unnecessary code from vo x11, xv, xvmc
- * automatic detection of hw acceleration (vo gl:yuv=x) for vo_gl
+ * add OS/2 DART audio driver (-ao dart)
+ * add VDPAU video output
MEncoder:
* check for system-wide configuration file in MEncoder
@@ -116,11 +163,16 @@ MPlayer (1.0)
* add options to disable some or all configuration files
* support for DOS-style file:///x:/path paths
* some new slave commands (check DOCS/tech/slave.txt)
- * misc fixes to libass
* libdvdcss updated to 1.2.10, now same as upstream version
* fix -endchapter support again for -dump* options
* add startup volume option
+ libass:
+ * various fixes and updates to match VSFilter renderer
+ * support \blur tag and ScaledBordersAndShadow property
+ * fractional arguments and subpixel accuracy
+ * keep positions when pan-and-scan is used
+
Ports:
* small crash with vo_macosx fixed
* AC3/DTS passthrough for ao_macosx
@@ -129,6 +181,7 @@ MPlayer (1.0)
* VIDIX on SuperH.
* workarounds for AltiVec on Apple gcc 3.3 on Mac OS X dropped
* vo_macosx can now be compiled in 64-bits mode
+ * allow multiple MPlayer instances w/ vo_macosx using buffer_name
* OpenGL support for unmodified MinGW64
SWScaler:
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index a518775ae2..3f250fced5 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -904,6 +904,7 @@ i.e.\& using the shell.
MPlayer uses this command without any checking, it is your responsib