commit 1bc1b5d3d14f4a43e128a542c3291da2b19d5cc5 Author: Kovensky Date: Sun Mar 29 23:08:44 2009 -0300 Fix rendering of glyphs with big borders libass/ass_render.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) commit 683b8519f70759a07a15a90ce5391c1d43c15f63 Author: Kovensky Date: Sun Mar 29 23:08:28 2009 -0300 Fix LZO symbol breakage yet again... ffmpeg | 2 +- libmpcodecs/vd_lzo.c | 4 ++-- libmpdemux/demux_mkv.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) commit d671c182185b50c23c09f469223e00238c74ad72 Author: Kovensky Date: Sun Mar 29 21:35:33 2009 -0300 Updated for new build environment. config.sh | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) commit fc691b8c4b41c6caaea05921ccf81d66c2d03155 Author: Kovensky Date: Thu Mar 5 06:34:07 2009 +0900 Import libass from greg's branch. http://greg.geekmind.org/git/mplayer.git libass/ass.c | 1 - libass/ass_bitmap.c | 76 ++++++++++------ libass/ass_bitmap.h | 9 ++- libass/ass_cache.c | 14 +--- libass/ass_cache.h | 35 +++++++- libass/ass_cache_template.c | 88 ------------------ libass/ass_font.c | 3 +- libass/ass_font.h | 1 - libass/ass_fontconfig.c | 79 ++++++++--------- libass/ass_fontconfig.h | 2 +- libass/ass_mp.c | 1 - libass/ass_render.c | 205 ++++++++++++++++++++++++------------------- libass/ass_types.h | 1 - 13 files changed, 241 insertions(+), 274 deletions(-) commit 53ca99cd4b53143b76eace88b20d94d16ede2558 Author: Kovensky Date: Wed Mar 4 23:18:22 2009 +0900 Only print version head once mplayer.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit c344540df4753f7c2c2aaeeaf73fbaef4af1a91f Author: Kovensky Date: Wed Mar 4 23:04:35 2009 +0900 Fix undefined reference errors to av_lzo1x_decode libmpcodecs/native/nuppelvideo.c | 4 ++-- libmpcodecs/vd_lzo.c | 2 +- libmpdemux/demux_mkv.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit f51edfecd2f63e6cf8ab0d7389e4999a9f5e5b4f Author: Kovensky Date: Wed Mar 4 22:58:06 2009 +0900 Add .exe files to .gitignore .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 2ecb25353592f4fd1492e9a97b08c3c94c030ca8 Author: Kovensky Date: Wed Mar 4 22:55:01 2009 +0900 Fix pthreads detection configure | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 846a9a4e2b2b2e8b8b6701a31bd8981e078e7923 Author: Kovensky Date: Wed Mar 4 19:33:27 2009 +0900 Compilation fixes config.sh | 2 +- ffmpeg | 2 +- libmpcodecs/native/nuppelvideo.c | 114 ++++++++++++++++++++++++++++++++++++++ libmpcodecs/vd_lzo.c | 2 +- libmpdemux/demux_mkv.c | 12 ++-- 5 files changed, 123 insertions(+), 9 deletions(-) commit 3ce802f44df975d331051a301f15429b2ba3809b Author: Kovensky Date: Fri Feb 6 14:00:54 2009 -0300 Several libass fixes libass/ass_bitmap.c | 9 +++++++-- libass/ass_render.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) commit 2401641635db5d0ddc8608fd2cb8a36a24b1d2e2 Author: Kovensky Date: Fri Feb 6 13:54:58 2009 -0300 Add date to the header version.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8781e5a4c7338e4bc2b89eeb04b962a17d4af4c6 Author: Kovensky Date: Fri Feb 6 13:51:49 2009 -0300 Ported changes from the SVN tree. DOCS/tech/slave.txt | 5 +++ cfg-mplayer-def.h | 15 ++++++-- command.c | 7 ++++ config.sh | 10 +++++ configure | 36 +++++++++++++----- defaultopts.c | 2 +- etc/codecs.conf | 14 +++++++ etc/mplayer.ico | Bin 5694 -> 74116 bytes input/input.c | 36 +++++++++++++++++-- input/input.h | 1 + liba52/imdct.c | 4 +- libaf/af_equalizer.c | 13 ++++++- libmpcodecs/vd_dshow.c | 3 +- libmpcodecs/vd_ffmpeg.c | 21 ++++++++++- libmpdemux/demux_lavf.c | 3 ++ libswscale/swscale_internal.h | 2 +- libvo/font_load_ft.c | 8 +++- libvo/vo_direct3d.c | 21 ++++++++++- libvo/vo_directx.c | 19 +++++++++- libvo/w32_common.c | 15 ++++---- mencoder.c | 14 +++++++ mp_msg.c | 57 ++++++++++++++++++++++++++++- mplayer.c | 81 ++++++++++++++++++++++++++++++++++++++++- osdep/keycodes.h | 30 +++++++++++++++ osdep/mplayer.rc | 3 +- osdep/resource.h | 6 +++ version.sh | 18 +++------- 27 files changed, 389 insertions(+), 55 deletions(-) commit 8f0eb9fbb15ecfe9720de0a657b4707769ba6cd3 Author: Uoti Urpala Date: Wed Mar 25 17:20:54 2009 +0200 Update FFmpeg-mt submodule ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit bd513856e18ed9b7d3dfc88a5c510ab6f4269aa2 Merge: 57ca7a3... 7af8417... Author: Uoti Urpala Date: Wed Mar 25 17:19:44 2009 +0200 Merge branch 'master' into mt commit 7af8417ae7beb409f54849956a7037bc66c4c334 Author: Uoti Urpala Date: Sun Mar 22 04:26:59 2009 +0200 vo_gl: Fix libass subtitles disappearing during pause EOSD bitmaps were not properly redrawn when the screen was updated to change other OSD content, resulting in libass subtitles disappearing if the OSD changed while paused. Fixed by adding a call to redraw the EOSD part too. libvo/vo_gl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit ebcb5a7154af539d0b0fb869e0a70c66bbd6eda1 Author: Uoti Urpala Date: Fri Mar 20 03:39:29 2009 +0200 Fix video stream switch code typo Restore accidentally dropped '!' to fixed-vo test in reinit_video_chain(). It could have caused some issues when switching video streams. Probably nobody noticed because files with multiple video streams are rare. mplayer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 57ca7a3771dd53f3f56cc2e09a37eccf1a7a6a90 Merge: 72dabb0... ae2faad... Author: Uoti Urpala Date: Sun Mar 15 00:00:30 2009 +0200 Merge branch 'master' into mt, update FFmpeg-mt submodule commit ae2faad6669c313b7a5dd318baeee0bffdd47031 Merge: b93f4b7... 642162c... Author: Uoti Urpala Date: Sat Mar 14 23:52:45 2009 +0200 Merge svn changes up to r28951 commit 642162c07460e439d1d81cda4643dc028ed238e0 Author: gpoirier Date: Sat Mar 14 20:58:18 2009 +0000 sync w/r28950 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28951 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/fr/mplayer.1 | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) commit 366c3fa13d9bf8733f2cadf331f9a0a09c1e4e1f Author: diego Date: Sat Mar 14 18:44:58 2009 +0000 KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 1 + DOCS/man/en/mplayer.1 | 17 + Makefile | 1 + configure | 29 ++ libvo/video_out.c | 4 + libvo/vo_kva.c | 1087 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1139 insertions(+), 0 deletions(-) commit 2adaae35cf2c9beaad4ebf0a75fedf2ffe2733b1 Author: diego Date: Sat Mar 14 17:01:28 2009 +0000 Move page heading and table of contents out of the codec support table. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28949 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/codecs-in.html | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) commit 0c7aa35c2a62635411379024db6dae80de9f7c47 Author: diego Date: Sat Mar 14 16:58:22 2009 +0000 Give table headings more meaningful names. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28948 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/codecs-in.html | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) commit dc518c0c138520998f1417fcae11c65b096cafe0 Author: cehoyos Date: Sat Mar 14 16:43:10 2009 +0000 Clarify that -vo vdpau:deint=n delays video output for n>2 by one frame. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28947 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit e7d3dce041f6d7816884136057038a2acca6c11a Author: diego Date: Sat Mar 14 16:00:21 2009 +0000 Add /usr/X11R7 to the list of directories in which to search for X11 includes and libraries. patch by Bernd Ernesti, mplayer-dev-eng lists veego.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28946 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 36910ebe97379b558529a53be00c6710465ef990 Author: diego Date: Sat Mar 14 15:56:16 2009 +0000 Only compile fastmemcpybench on x86. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28945 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit bc4e834998995f37216b3d52f6d974409fc3e455 Author: reimar Date: Sat Mar 14 12:32:28 2009 +0000 Set DOCTYPE in xsl-generated HTML documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28944 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/html-common.xsl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 4acac0faf50449e071ee7557685b5f64ad4ea5ec Author: sdrik Date: Sat Mar 14 08:11:03 2009 +0000 Make the source buffer operands parametrized in the YSCALEYUV2RGB_YA macro git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28943 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit 1f1b999cb94a1c98be13db954cba9ed3f41f6378 Author: reimar Date: Fri Mar 13 17:12:40 2009 +0000 Check for HAVE_EBX_AVAILABLE before enabling MMX code that needs the EBX register. Makes things a bit simpler for everyone who insists on compiling MPlayer as PIE-code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28942 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_decimate.c | 4 ++-- libmpcodecs/vf_divtc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit f9f40364d70d86971199d946052e494b6bd96ba1 Author: reimar Date: Fri Mar 13 17:09:39 2009 +0000 Use the same code as in vf_decimate to select diff_MMX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28941 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_divtc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit 2af2550175ced5cf5f4e8a3cd37f1940e5a49683 Author: reimar Date: Fri Mar 13 17:02:15 2009 +0000 Add missing ecx clobber in diff_MMX code (yes, that function is duplicated). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28940 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_decimate.c | 2 +- libmpcodecs/vf_divtc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit db0be495091fa8b4cf64f5d0fb36a20d31fba232 Author: reimar Date: Fri Mar 13 16:42:42 2009 +0000 Fix compilation with --charset=noconv git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28939 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit e530d4b4673c745a3f48f750b9ecd628f1c929c9 Author: diego Date: Thu Mar 12 11:55:26 2009 +0000 Replace duplicated code by a macro. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28938 b3059339-0415-0410-9bf9-f77b7e298cf2 TOOLS/fastmemcpybench.c | 61 ++++++++++++---------------------------------- 1 files changed, 16 insertions(+), 45 deletions(-) commit 4143892c3beef713a968d4db95f5f7ee8a0ea380 Author: compn Date: Thu Mar 12 11:16:51 2009 +0000 add some info for acm and tips for searching git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28937 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/win32-codec-howto.txt | 41 ++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 5 deletions(-) commit cb9716ac6e5d12a778f98030ca36b5403b7c12a2 Author: diego Date: Thu Mar 12 10:50:21 2009 +0000 SSE3 support patch by Zhou Zongyi, zhouzongyi pset.suntec net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28936 b3059339-0415-0410-9bf9-f77b7e298cf2 cpudetect.c | 2 ++ cpudetect.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) commit a0735f585933ca7834285fab5191ec867d9f936e Author: greg Date: Wed Mar 11 22:55:23 2009 +0000 Use ScaledBorderAndShadow: yes by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28935 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 437ee8cc61365f43b09c4139bf15ded8ade43dc9 Author: sdrik Date: Wed Mar 11 14:44:22 2009 +0000 Make MMX registers parametrized in the YSCALEYUV2PACKEDX_YA macro git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28934 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) commit 7fee9f0101e0a196495a4980d78a4b09bd8f073c Author: sdrik Date: Wed Mar 11 14:22:53 2009 +0000 In initMMX2HScaler, when chrDstW is not divisible by 4, the last filterPos element is initialized on the wrong index (not evenly aligned). This fixes it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28933 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c2410d6cc9cf6e9084b559538bf9aa958ed47887 Author: diego Date: Wed Mar 11 00:25:23 2009 +0000 Update email address for Vajna, Miklós. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28932 b3059339-0415-0410-9bf9-f77b7e298cf2 AUTHORS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 842880eecbfa5cc9fafe634cd324acd5e3626512 Author: compn Date: Tue Mar 10 23:23:01 2009 +0000 add sn40 binary codec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28931 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit 4e7827edeb16a3cb5398e0f2e5935ed4048a8ce9 Author: compn Date: Tue Mar 10 20:16:16 2009 +0000 sn40 decodes with ffodivx git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28930 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 143a63fd9eef49e84c26faf7644b032c8db79939 Author: diego Date: Tue Mar 10 10:05:09 2009 +0000 Fix and restructure fastmemcpybench. It is now one binary that runs all available memcpy variants and prints benchmark results about them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28929 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 22 +------ TOOLS/fastmem.sh | 21 ------- TOOLS/fastmemcpybench.c | 142 +++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 140 insertions(+), 45 deletions(-) commit cae648825521d65effff0fd371e142a8dc2d9cca Author: compn Date: Tue Mar 10 02:21:49 2009 +0000 typo nuppelvideo spotted by kostya git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28928 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 919793e643612389a79d580c5306c1d4e991d0d4 Author: cehoyos Date: Mon Mar 9 23:46:28 2009 +0000 Output number of reference frames before creating H264 vdpau decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28927 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit fa60631a76710d0ef50e840cc5046e216eace74c Author: diego Date: Mon Mar 9 23:19:16 2009 +0000 Update entry for libdvdread; add entry for libdvdnav. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28926 b3059339-0415-0410-9bf9-f77b7e298cf2 Copyright | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) commit ab1163d8c5ac58dbbd9567349598e81e704bbe37 Author: diego Date: Mon Mar 9 23:15:26 2009 +0000 cosmetics: Add newlines for better readability, rename Homepage entry to URL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28925 b3059339-0415-0410-9bf9-f77b7e298cf2 Copyright | 53 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 18 deletions(-) commit 6040551ed4864a7d459128307c943aa5244a15cd Author: diego Date: Mon Mar 9 21:40:20 2009 +0000 GraphEdit is also available in the Microsoft SDK nowadays. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28924 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/win32-codec-howto.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a06215d67ad6b5669d3e7a8d4bc2d0bdddc8dbf1 Author: kraymer Date: Mon Mar 9 21:31:36 2009 +0000 typo git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28923 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/mingw-crosscompile.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit e633583d8cbc9e183aabf7aff6cf82c07df848bf Author: diego Date: Mon Mar 9 20:56:19 2009 +0000 libmpdemux/nuppelvideo.h was removed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28922 b3059339-0415-0410-9bf9-f77b7e298cf2 Copyright | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 597bfd44bdcecfb1108d099e3ead21d1c6837e5f Author: diego Date: Mon Mar 9 20:48:20 2009 +0000 partial further sync by patch by sevenfourk, sevenfourk gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28921 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-uk.h | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) commit 540847db7b60c782a2bcf68a9c12dac186d89941 Author: ben Date: Mon Mar 9 20:31:03 2009 +0000 Ensure the string we're trying to compare is actually not NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28920 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/librtsp/rtsp_rtp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 571c0fb8a949fe55fb685060f7b5d190f7c42b7f Author: ben Date: Mon Mar 9 20:30:24 2009 +0000 The first valid index is total count - 1 (usually 0) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28919 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/freesdp/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2c64a71a2928bed7b57ab98d6f3130354bab61ae Author: reimar Date: Mon Mar 9 19:15:20 2009 +0000 Do not call waveOutReset in uninit if you should wait till playing finishes, and retry waveOutClose if it fails due to still playing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28918 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 28531054594678e6807cc8b34092903e3e445504 Author: reimar Date: Mon Mar 9 18:21:47 2009 +0000 Reuse libavutil fifo code instead of reimplementing it over and over. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28917 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_jack.c | 102 ++++++++++++++++++----------------------------------- libao2/ao_sdl.c | 87 +++++++++++----------------------------------- 2 files changed, 56 insertions(+), 133 deletions(-) commit 72304af23b416364e5e500f699b7c2daf9708c8f Author: kostya Date: Mon Mar 9 17:25:43 2009 +0000 Mask all unused bits for packed pixel format instead of green and alpha mask only. That fixes the case when converting 15-bit RGB/BGR to YUV and high bit is set for input value(s). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28916 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 37e7934dcebe04a3ae6ecacf386ff0eb0b928438 Author: reimar Date: Mon Mar 9 15:01:53 2009 +0000 Get rid of DEMUXER_TYPE_NUV define, it is no longer used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28915 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 8c5b570b50f956366be55b78c754c26a02c3d817 Author: reimar Date: Mon Mar 9 15:01:12 2009 +0000 Get rid of nuppelvideo.h and its ugly packed struct and instead write the frame header directly in nuv encoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28914 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ve_nuv.c | 35 ++++++++++---------- libmpdemux/nuppelvideo.h | 80 ---------------------------------------------- 2 files changed, 17 insertions(+), 98 deletions(-) commit 9545a4a211fc124b79a35e6ff5070643eb00b87e Author: compn Date: Mon Mar 9 14:49:17 2009 +0000 people are forgetting to update the changelog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28913 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit f10bffc6f8e5946d5ee0c2b02a45c4d7dad63b33 Author: reimar Date: Mon Mar 9 14:40:55 2009 +0000 Fix type of zlen, fixes crashes on 64 bit systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28912 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ve_nuv.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 78383383f77308f44dfd94aea1e3b6af77cd1cef Author: reimar Date: Mon Mar 9 14:32:19 2009 +0000 Do not calculate the same value twice git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28911 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ve_nuv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c9872edafeb35978253d9d9cacd53e0bc182e976 Author: reimar Date: Mon Mar 9 14:30:41 2009 +0000 Allocate buffer for lzo compression correctly also for large frame sizes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28910 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ve_nuv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 77195cf5c40e77e9876c4a82808f1819c1d3840b Author: reimar Date: Mon Mar 9 13:37:55 2009 +0000 nuv encoder 64 bit fix: avoid using long/sizeof(long) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28909 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ve_nuv.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit 3a0ffa5bf43a000ce8b0d4a3bd9572dc92f83ff4 Author: reimar Date: Mon Mar 9 13:23:27 2009 +0000 Remove now unused parts of nuppelvideo.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28908 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/nuppelvideo.h | 99 ---------------------------------------------- 1 files changed, 0 insertions(+), 99 deletions(-) commit 601d694829fd572d9f18a52c775cae958abc4d2c Author: reimar Date: Mon Mar 9 13:11:37 2009 +0000 Remove native nuv demuxer, it only needs more code to achieve the same thing as the libavformat demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/MAINTAINERS | 1 - Makefile | 1 - libmpdemux/demux_nuv.c | 461 ------------------------------------------------ libmpdemux/demuxer.c | 2 - 4 files changed, 0 insertions(+), 465 deletions(-) commit 591ce556b732b638804a0336cb8c17168251e17d Author: reimar Date: Mon Mar 9 12:59:14 2009 +0000 Make fastmemcpybench almost working - only thing missing is a way to override HAVE_MMX etc. from config.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28906 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 4 ++-- TOOLS/fastmemcpybench.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) commit 526d2f16c2c4a0b6346259543d1ec628c3651cb4 Author: Gabrov Date: Mon Mar 9 12:29:42 2009 +0000 synced with r28895 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28905 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 20 +++++++++++++------- help/help_mp-hu.h | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) commit 807b942713b75402cd16e644b5f6d41cf2fa3373 Author: diego Date: Mon Mar 9 11:32:43 2009 +0000 comment/output cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28904 b3059339-0415-0410-9bf9-f77b7e298cf2 TOOLS/fastmemcpybench.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit a0bce02b7c29bba8a4a69dff1f61e80e1d2ad979 Author: diego Date: Mon Mar 9 11:28:31 2009 +0000 whitespace cosmetics: - Remove all tabs and trailing whitespace. - Indent with 4 spaces. - K&R-ify and prettyprint some parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28903 b3059339-0415-0410-9bf9-f77b7e298cf2 TOOLS/fastmemcpybench.c | 149 ++++++++++++++++++++++++----------------------- 1 files changed, 75 insertions(+), 74 deletions(-) commit 1753d37fc714f2eb387689140016908845d5af3f Author: diego Date: Mon Mar 9 11:02:54 2009 +0000 Merge two preprocessor conditions in order to drop one duplicated #else case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28902 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/fastmemcpy.h | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) commit 3c189b6940d304770c2d7610b5d6704d613d6b5f Author: diego Date: Mon Mar 9 10:14:11 2009 +0000 Ignore all fastmem-* binaries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28901 b3059339-0415-0410-9bf9-f77b7e298cf2 commit 708819105f20bbe4e608045e13e1f025352d7def Author: greg Date: Mon Mar 9 01:48:42 2009 +0000 Change default OSD/subtitle font sizes. This was discussed on -dev-eng and IRC. The consensus seems to be that 3-4% of the diagonal is a good default, and most people use something along these lines. The subtitle font size is set to 3.5% and the OSD is kept a little bigger with 4%. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28900 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/font_load_ft.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 15b605c6909f668abaf937ff9588defd5714101e Author: diego Date: Mon Mar 9 00:48:03 2009 +0000 Fix fastmemcpybench tools build: - HAVE_MMX and friends now have 0/1 values and are always defined. - Use proper file dependencies instead of a phony target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28899 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) commit 0500783b366223fcb8b2e1e82ba74d1d9c91957f Author: gpoirier Date: Sun Mar 8 20:27:31 2009 +0000 sync w/r28895 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28898 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/fr/mplayer.1 | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) commit 1e3f85d23e2004a3d5aacd08633d19eb9a2ae348 Author: bircoph Date: Sun Mar 8 17:49:34 2009 +0000 Synced with r28895. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28897 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/ru/mplayer.1 | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) commit 79b915673295129c39848765b06972136c82b607 Author: eugeni Date: Sun Mar 8 16:13:26 2009 +0000 Cosmetics: reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28896 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_fontconfig.c | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) commit 686d57168f91e7314a0dc7a3ce95a905e83e49dc Author: eugeni Date: Sun Mar 8 16:13:21 2009 +0000 Treat -font/-subfont as Fontconfig pattern in libass. Patch by Adrian Stutz (adrian sttz ch). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28895 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 10 ++++++---- libass/ass_cache.c | 2 ++ libass/ass_font.c | 3 ++- libass/ass_font.h | 1 + libass/ass_fontconfig.c | 31 ++++++++++++++++++++----------- libass/ass_fontconfig.h | 2 +- libass/ass_mp.c | 1 + libass/ass_render.c | 3 +++ libass/ass_types.h | 1 + 9 files changed, 37 insertions(+), 17 deletions(-) commit 1f612555888ae906248cad0fad70667adce1c58f Author: michael Date: Sun Mar 8 15:56:20 2009 +0000 Add test for C memcpy() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28894 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 1 + TOOLS/fastmem.sh | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) commit 1a493bf6a845f3a45bbc55366171fe7176b8939c Author: michael Date: Sun Mar 8 15:43:52 2009 +0000 Resurrect script needed for easy use of fastmemcpybench.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28893 b3059339-0415-0410-9bf9-f77b7e298cf2 TOOLS/fastmem.sh | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) commit 2a70f019e97ac9d1cbbb9f30ddf44a593e446b24 Author: greg Date: Sun Mar 8 15:30:40 2009 +0000 Remove extraneous braces. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28892 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit af0797010e654110fe61ed1787ba4ef72759d9eb Author: greg Date: Sun Mar 8 15:30:27 2009 +0000 Don't assume width == stride for bitmap composition. Fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1421 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28891 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) commit b638947171338921f4bc7c759bc0c881c2be06fc Author: michael Date: Sun Mar 8 15:20:14 2009 +0000 Revert r3082 | michael | 2001-11-23 13:00:40 +0100 (Fri, 23 Nov 2001) | 2 lines missaligned arrays, as nick requested Reason: idiotic idea git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28890 b3059339-0415-0410-9bf9-f77b7e298cf2 TOOLS/fastmemcpybench.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e9f1f090e8f7c85318a2ee53c7e142a89c459c9f Author: reimar Date: Sun Mar 8 13:56:35 2009 +0000 rtjpegn.c is only needed by the NuppelVideo encoder, change Makefile accordingly git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28889 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 276a73e2f29cce0c0e2dc18aa0e9e804b812762b Author: reimar Date: Sun Mar 8 13:32:42 2009 +0000 Remove internal NuppelVideo decoder, the code in libavcodec can decode those files and some more and is far more maintainable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 - etc/codecs.conf | 8 - libmpcodecs/native/nuppelvideo.c | 114 ---- libmpcodecs/native/rtjpegn.c | 1380 -------------------------------------- libmpcodecs/native/rtjpegn.h | 2 - libmpcodecs/vd.c | 2 - libmpcodecs/vd_nuv.c | 54 -- 7 files changed, 0 insertions(+), 1562 deletions(-) commit 624d8ff171a838af46ddd095e6af8cb8f13db1e1 Author: reimar Date: Sun Mar 8 13:21:00 2009 +0000 Get rid of pointless debugging code git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28887 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/native/rtjpegn.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) commit 7903f65ee88010a3cd45df78e181120ee5482046 Author: reimar Date: Sun Mar 8 13:17:18 2009 +0000 Remove the grayscale and 4:2:2 RTjpeg code, it is neither used nor is there anything special about to to justify preserving it for documentation purposes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28886 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/native/rtjpegn.c | 257 ------------------------------------------ 1 files changed, 0 insertions(+), 257 deletions(-) commit 735c81a0f5a030be77e411ac49be23bb090a793a Author: reimar Date: Sun Mar 8 13:10:21 2009 +0000 Remove colourspace-conversion stuff from rtjpeg, we have functions to do that better and it doesn't belong in that file anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28885 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/native/rtjpegn.c | 384 ------------------------------------------ 1 files changed, 0 insertions(+), 384 deletions(-) commit 6d367acbdde9f542c011b7bfd61689e103e56561 Author: reimar Date: Sun Mar 8 13:08:22 2009 +0000 Mark everything not used outside the file as "static" git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28884 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/native/rtjpegn.c | 72 +++++++++++++++++++++--------------------- 1 files changed, 36 insertions(+), 36 deletions(-) commit 04702afb8426d81f69da542f89fdec7ae84550ec Author: reimar Date: Sun Mar 8 13:02:44 2009 +0000 Remove functions not used by MPlayer from header git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28883 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/native/rtjpegn.h | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) commit 8afafb8c2eb88da719b7737ddbc3db1564133a4d Author: reimar Date: Sun Mar 8 12:57:53 2009 +0000 Remove useless "extern" in function declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28882 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/native/rtjpegn.h | 44 +++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 22 deletions(-) commit c1359e3dbdbaaf636df6fd5039347e5aed2e91a6 Author: reimar Date: Sun Mar 8 10:01:21 2009 +0000 Add a small howto explaining how to cross-compile for MinGW git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28881 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/mingw-crosscompile.txt | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) commit 911ae6d594802d615c49b1061b62ee1ee11c5d6f Author: reimar Date: Sun Mar 8 09:34:26 2009 +0000 Explain that disabling other input methods is not the purpose of -slave git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28880 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 29c8d702423fe063da66ee217669f56c045ded06 Author: reimar Date: Sun Mar 8 09:28:01 2009 +0000 Remove unused variable from demux_mov. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28879 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_mov.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 4a5c933303a85cce089ee46ef93f2b9e176e12f7 Author: reimar Date: Sun Mar 8 09:14:30 2009 +0000 Add an option to disable the default key binding that MPlayer includes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28878 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 ++ input/input.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) commit e46d74d4aebe66706988cbdae79d938f9beb6928 Author: reimar Date: Sun Mar 8 08:56:28 2009 +0000 Bump etc/codecs.conf version to eliminate one possible cause when debugging VDPAU issues. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28877 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2c55cbabf9e682ce10535cbc6125cdcc2093dc35 Author: greg Date: Sun Mar 8 04:03:28 2009 +0000 Fix clipping for pan-and-scan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28876 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit eb3f82bfee6b3a95f47ea0557a4002b8b3f4fdac Author: greg Date: Sun Mar 8 04:03:24 2009 +0000 Add a proper color check to the overlap compositing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28875 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 668810ab04cb3adffa187dcb5075841837a62af6 Author: greg Date: Sun Mar 8 02:53:14 2009 +0000 Replace rotation functions with a simplified version adapted from vsfilter. This (mostly) fixes http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1394#c7 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28874 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 119 +++++++++++++++++---------------------------------- 1 files changed, 40 insertions(+), 79 deletions(-) commit 463d61c7a620dd7593072ff4c46fff558998357e Author: greg Date: Sat Mar 7 23:56:03 2009 +0000 Only use first \org in a line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28873 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit 41bd5a75fd9611b79f4fae56743021d36df6e89f Author: diego Date: Sat Mar 7 17:41:34 2009 +0000 cosmetics: spelling fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28872 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_macosx.m | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit 1e94c915a2a6949b641c0650cd56d1dc7478dd3d Author: diego Date: Sat Mar 7 13:45:48 2009 +0000 cosmetics: Reformat file header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28871 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_macosx.m | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) commit 062f66bbcaa4ae449aec5068f0fc67d0ced04654 Author: reimar Date: Sat Mar 7 13:25:55 2009 +0000 Make pausing_keep_force the default for the set_mouse_pos and key_down_event - different behaviour is unlikely to make sense but it is better to handle this in input.c instead of adding special cases to mplayer.c and being able to override the default behaviour at least should not hurt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28870 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/slave.txt | 2 ++ input/input.c | 11 ++++++++++- mplayer.c | 3 +-- 3 files changed, 13 insertions(+), 3 deletions(-) commit 7397dbcb66b7e2e36120c3c7e5d05f81962a1d2c Author: reimar Date: Sat Mar 7 12:50:52 2009 +0000 Update x264 version check for version required by lavc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28869 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 052223b1958cfe0ce39a2180dfccb6a76af61ed9 Author: sdrik Date: Sat Mar 7 09:39:48 2009 +0000 Let the 4th plane reach the swScale function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28868 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) commit b099db94af947c2ac9e6888fddeac9b6e6e0fe6d Author: sdrik Date: Sat Mar 7 09:37:25 2009 +0000 YUVA420P is a planar YUV format git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28867 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 69277f986b26dcbae99903eb76e859efb57409ec Author: reimar Date: Sat Mar 7 09:14:45 2009 +0000 Reduce size of needlessly large mp3lib bandInfoStruct git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28866 b3059339-0415-0410-9bf9-f77b7e298cf2 mp3lib/layer3.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 2ee2d164ce2c06fb17f6d47446003a717e25e63c Author: reimar Date: Sat Mar 7 09:08:02 2009 +0000 Make several constant mp3lib tables const git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28865 b3059339-0415-0410-9bf9-f77b7e298cf2 mp3lib/decode_mmx.c | 10 +++++----- mp3lib/layer3.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) commit fca78186689deea70cb619a5e0bc3dc5dd74651e Author: reimar Date: Sat Mar 7 08:52:57 2009 +0000 Setting vo_fs is handled by x11_common.c, so remove that code from vo_xv/vo_xvmc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28864 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_xv.c | 2 -- libvo/vo_xvmc.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) commit 05119ecaf6e8628377f324da97ff6af58f3e380f Author: reimar Date: Sat Mar 7 08:51:40 2009 +0000 Make data related to suboption parsing const in libvo git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_aa.c | 8 ++++---- libvo/vo_directfb2.c | 2 +- libvo/vo_gif89a.c | 2 +- libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- libvo/vo_ivtv.c | 2 +- libvo/vo_jpeg.c | 2 +- libvo/vo_md5sum.c | 2 +- libvo/vo_png.c | 2 +- libvo/vo_pnm.c | 2 +- libvo/vo_sdl.c | 2 +- libvo/vo_v4l2.c | 2 +- libvo/vo_vdpau.c | 2 +- libvo/vo_xv.c | 2 +- libvo/vo_xvmc.c | 2 +- libvo/vo_yuv4mpeg.c | 2 +- libvo/vo_zr2.c | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) commit b93f4b7bba0e31d157b74685d3166f74a6c244d7 Author: Uoti Urpala Date: Sat Mar 7 01:08:02 2009 +0200 codec-cfg.c: Remove bogus printf argument Two printf calls had a bogus argument that did not match the format string. Remove. codec-cfg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e0172b96e3b6cc6a8b62ee5a52f780941a43de8b Merge: 0c6f667... 7e253f0... Author: Uoti Urpala Date: Sat Mar 7 01:04:41 2009 +0200 Merge svn changes up to r28862 commit 7e253f01715811e0c4f5f5b54317b098f2cd59d9 Author: reimar Date: Fri Mar 6 20:41:02 2009 +0000 Get rid of the "set" member of the subopt-parser struct, it made it impossible to make the those struct variables const. Also it is not really useful, and wastes space. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28862 b3059339-0415-0410-9bf9-f77b7e298cf2 subopt-helper.c | 13 +++---------- subopt-helper.h | 5 +---- 2 files changed, 4 insertions(+), 14 deletions(-) commit 6cf4aafa36a609b02d5cf106b88cc8b79b9bd9d4 Author: reimar Date: Fri Mar 6 20:20:12 2009 +0000 Add some "const" to mpcodecs_vd_drivers git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28861 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd.c | 2 +- libmpcodecs/vd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit aaa937e798f8b5e9e6ef51fd12807bee7f21f478 Author: reimar Date: Fri Mar 6 20:11:23 2009 +0000 The large -help help_text should be const so it goes into .rodata git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28860 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-bg.h | 2 +- help/help_mp-cs.h | 2 +- help/help_mp-de.h | 2 +- help/help_mp-dk.h | 2 +- help/help_mp-el.h | 2 +- help/help_mp-en.h | 2 +- help/help_mp-es.h | 2 +- help/help_mp-fr.h | 2 +- help/help_mp-hu.h | 2 +- help/help_mp-it.h | 2 +- help/help_mp-ja.h | 2 +- help/help_mp-ko.h | 2 +- help/help_mp-mk.h | 2 +- help/help_mp-nb.h | 2 +- help/help_mp-nl.h | 2 +- help/help_mp-pl.h | 2 +- help/help_mp-pt_BR.h | 2 +- help/help_mp-ro.h | 2 +- help/help_mp-ru.h | 2 +- help/help_mp-sk.h | 2 +- help/help_mp-sv.h | 2 +- help/help_mp-tr.h | 2 +- help/help_mp-uk.h | 2 +- help/help_mp-zh_CN.h | 2 +- help/help_mp-zh_TW.h | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) commit 54c1d8319764c34ea3928295412ac69e73d43cab Author: reimar Date: Fri Mar 6 19:58:16 2009 +0000 Make audio_out_* structs const so they end up in .rodata git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28859 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/audio_out.c | 46 +++++++++++++++++++++--------------------- libao2/audio_out_internal.h | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) commit d6bf2e318e785f1ddaf4f3ecd61ec780eca5bb24 Author: reimar Date: Fri Mar 6 19:43:12 2009 +0000 Make ao_info_t structs const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28858 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 2 +- libao2/ao_alsa5.c | 2 +- libao2/ao_arts.c | 2 +- libao2/ao_dart.c | 2 +- libao2/ao_dsound.c | 2 +- libao2/ao_dxr2.c | 2 +- libao2/ao_esd.c | 2 +- libao2/ao_ivtv.c | 2 +- libao2/ao_jack.c | 2 +- libao2/ao_macosx.c | 2 +- libao2/ao_mpegpes.c | 2 +- libao2/ao_nas.c | 2 +- libao2/ao_null.c | 2 +- libao2/ao_openal.c | 2 +- libao2/ao_oss.c | 2 +- libao2/ao_pcm.c | 2 +- libao2/ao_pulse.c | 2 +- libao2/ao_sdl.c | 2 +- libao2/ao_sgi.c | 2 +- libao2/ao_sun.c | 2 +- libao2/ao_v4l2.c | 2 +- libao2/ao_win32.c | 2 +- libao2/audio_out.h | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) commit 77e48c66357c1b51fa035935c46a626ffd98a054 Author: reimar Date: Fri Mar 6 19:23:24 2009 +0000 Use code that is actually thread-safe to calculate delay, free space etc. in ao_win32 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28857 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) commit c73340f19a84af6ec9265adf57b4778090005334 Author: reimar Date: Fri Mar 6 19:10:54 2009 +0000 Cosmetics: get rid of trailing whitespace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28856 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) commit 6067203caba5f1bb91bebd73c89e82056aa8d1c2 Author: reimar Date: Fri Mar 6 19:07:50 2009 +0000 get rid of full_buffers variable, if the check it is used for is triggered something is seriously wrong and the ao will not work right anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28855 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) commit 6040a6f3ea230648783fbcd450b025feab52de57 Author: reimar Date: Fri Mar 6 18:53:29 2009 +0000 Remove now unused buf_write_pos variable from ao_win32 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28854 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit 7ee7bd3d5b72ad6480f7b9adf08e34b572e7c287 Author: reimar Date: Fri Mar 6 18:50:50 2009 +0000 Always write full buffers in ao_win32, except for the last block. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28853 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) commit 79df4b2499ab2384bf92132c03563cf88bf623b2 Author: reimar Date: Fri Mar 6 16:27:31 2009 +0000 Use calloc instead of malloc+memset git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28852 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 1b1bc049dba88de156cdc9c92cb85129e3b793f3 Author: gpoirier Date: Fri Mar 6 15:52:48 2009 +0000 sync w/r28807 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28851 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/fr/mplayer.1 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7c52124a2bd4913092805fb5831514e55cbf121b Author: reimar Date: Fri Mar 6 13:22:48 2009 +0000 The 8 bit per sample formats are unsigned on Windows, fixes playback with -af format=s8 for -ao dsound and -ao win32. Patch by Zhou Zongyi [zhouzongyi (at) pset suntec net] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28850 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_dsound.c | 2 +- libao2/ao_win32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit b33adcdd02e548818a6a8084bb64dac4e39a6a8e Author: reimar Date: Fri Mar 6 12:56:13 2009 +0000 Refactor smalltex/tinytex EOSD optimization in vo_gl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28849 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 57 +++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 18 deletions(-) commit b6d7a2552c86421db58b64c55f6c32c747488b14 Author: reimar Date: Fri Mar 6 11:47:51 2009 +0000 Remove several useless casts from af_resample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28848 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_resample.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit c2574a6b0aea0654db3d0a5b253952e6a75d8585 Author: reimar Date: Fri Mar 6 11:46:06 2009 +0000 Free af->setup and contents in af_resample uninit function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28847 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_resample.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 37a09a25fff31bb8fd860577430272567ba03cca Author: reimar Date: Fri Mar 6 11:42:45 2009 +0000 Use calloc to allocate the af_resample ring buffers, reportedly using non-zeroed buffers can cause initial noise, see -dev-eng: [PATCH]: Add missing memset after malloc in libaf/af_resample.c Wed, 4 Mar 2009 15:29:30 +0800 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28846 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_resample.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 33ca05bce930b4d5fa34b735f4edc61d52bcfa1a Author: reimar Date: Fri Mar 6 11:39:13 2009 +0000 Use a single malloc to allocate space for the circular buffers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28845 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_resample.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) commit 1dd64224c45a5f148a39d523582ab8e532a46a28 Author: reimar Date: Fri Mar 6 11:31:18 2009 +0000 Comment typo fixes for af_resample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28844 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_resample.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit 175cfc985c24c8599214f716a521fe9c75f54a94 Author: reimar Date: Fri Mar 6 10:53:30 2009 +0000 Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD, just like vo_vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28843 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit eb761e688ff0a7232c279f100a563b1bae1a5646 Author: reimar Date: Fri Mar 6 10:50:43 2009 +0000 Remove duplicate OSD drawing introduced due to a conflict between r28840 and r28839. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28842 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 3be5ebde87e8856650fdeef9614247bed637cbb1 Author: reimar Date: Fri Mar 6 10:45:49 2009 +0000 Swap order of VFCTRL_DRAW_EOSD and VFCTRL_DRAW_OSD so that the EOSD is drawn below the OSD and document possible issues when this is changed. Patch by Uoti (though originally intended for a different issue) with extra comment by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28841 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_video.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit d4748622fa98dcc5cb4cecc77655bec7476b8387 Author: reimar Date: Fri Mar 6 10:39:58 2009 +0000 As for vo_gl, do not rely on draw_osd to render EOSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28840 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 658bcd5e35b04de1a7fb0c2c8178ca8e37b2b1fa Author: greg Date: Fri Mar 6 10:38:27 2009 +0000 Draw EOSD with VOCTRL_DRAW_EOSD instead of along with OSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28839 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 397c4db88b78e67ad738eeb06ab8848fe79349dd Author: reimar Date: Fri Mar 6 10:33:35 2009 +0000 Do not rely on draw_osd to render the EOSD, instead draw it already at the end of genOSD. Fixes that the EOSD was drawn one frame too late. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28838 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) commit 27b512e1f58b273e3f36113f72a121da66cf9a5b Author: greg Date: Fri Mar 6 09:20:14 2009 +0000 Fix \be blur start position. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28837 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 25abe9651df43975b735430ef46145d1eb4ce047 Author: greg Date: Fri Mar 6 09:20:09 2009 +0000 Raise max. number of \be applications to 100, introduce #define for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28836 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit d303d39798d85bb38ed394cbee5d4fa178aae2b7 Author: greg Date: Fri Mar 6 01:26:44 2009 +0000 Replace magic numbers (for subpixel accuracy masking) with a define. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28835 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit d4423f75164db09d86c6b6109574e43b35d500b9 Author: greg Date: Fri Mar 6 01:17:05 2009 +0000 Use blur with kernel [[1,2,1], [2,4,2], [1,2,1]] for \be. This is faster than gaussian blur and similar to vsfilter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28834 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 40 ++++++++++++++++++++++++++++++++-------- libass/ass_bitmap.h | 2 +- libass/ass_render.c | 6 +----- 3 files changed, 34 insertions(+), 14 deletions(-) commit e7cb3e94b6548e3fc7ff80a60887bf562fc424c7 Author: diego Date: Fri Mar 6 00:47:03 2009 +0000 Sync latest set of changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28833 b3059339-0415-0410-9bf9-f77b7e298cf2 tremor/tremor.diff | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit d2a84bde4fb464151fd2eb781255a50334d523ec Author: diego Date: Fri Mar 6 00:41:09 2009 +0000 Sync local changes file with #ifdef --> #if conversion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28832 b3059339-0415-0410-9bf9-f77b7e298cf2 liba52/a52.h | 3 + liba52/liba52_changes.diff | 92 ++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 45 deletions(-) commit 848e6ff668c5e6eae203e83c2b035da9398b118a Author: diego Date: Fri Mar 6 00:10:17 2009 +0000 Sync local changes file with #ifdef --> #if conversion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28831 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpeg2/libmpeg2_changes.diff | 231 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 219 insertions(+), 12 deletions(-) commit 6ec76ef976247efd31468814ccbb1275e1907097 Author: diego Date: Thu Mar 5 23:36:28 2009 +0000 Add support for extracting the release version number from a VERSION file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28830 b3059339-0415-0410-9bf9-f77b7e298cf2 version.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 1005952a8ba43138089d130e74b40f22908911f3 Author: diego Date: Thu Mar 5 22:19:47 2009 +0000 Only add -Ilibdvdnav to the CFLAGS of the files that require it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 1 + configure | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) commit 2f2b27164906d25949c3db504d3f312118c1c431 Author: reimar Date: Thu Mar 5 22:07:06 2009 +0000 Sleep based on get_delay in ao_win32 uninit instead of a loop. The loop for an unknown reason could rarely cause an endless loop. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28828 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 3e40788623311c9b917116a80eb3c9f3d0d9c03c Author: diego Date: Thu Mar 5 21:27:05 2009 +0000 Simplify CFLAGS generation for individual targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28827 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit d4fbe9bc8bf01211f3d8bbd6a131ff4a10919f7b Author: greg Date: Thu Mar 5 21:16:21 2009 +0000 Update libass changelog. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28826 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 71cc30d9d57f476f9381062f99f26f4313675334 Author: sdrik Date: Thu Mar 5 21:02:33 2009 +0000 Fix bug introduced by me in r28756 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28825 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 9bad4bdce4ec7c09fa05022123a33a8edc7506f1 Author: greg Date: Thu Mar 5 20:47:33 2009 +0000 Combine adjacent overlapping, translucent glyph borders and shadows to avoid luminance build-up, which looks ugly. The resulting, modified bitmaps are stored in separate bitmap cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28824 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_cache.c | 50 ++++++++++++++++++++++++ libass/ass_cache.h | 21 ++++++++++ libass/ass_render.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 177 insertions(+), 1 deletions(-) commit 8ad008e12aa377fa54c1ed7c218c48d01392bdc7 Author: greg Date: Thu Mar 5 20:36:59 2009 +0000 Fix positioned events' y-position when pan-and-scan is used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28823 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit f9aba2b83aaffe806749031be747bebe853453ca Author: greg Date: Thu Mar 5 20:36:56 2009 +0000 Support for subpixel accuracy of 3 bits for \pos and \move. Also, restrict advance subpixel accuracy to 3 bits to reduce cache bloat. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28822 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) commit 40a38da7db1138644e3fb0e477dcbfe9aa8e0277 Author: greg Date: Thu Mar 5 20:36:52 2009 +0000 Style override for ScaledBorderAndShadow. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28821 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 2432bbd43d0dc22af0a5f57d2921448ed76a53c4 Author: greg Date: Thu Mar 5 20:36:48 2009 +0000 Support ScaledBorderAndShadow property. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28820 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 2 ++ libass/ass_render.c | 5 ++++- libass/ass_types.h | 1 + libass/ass_utils.c | 11 +++++++++++ libass/ass_utils.h | 1 + 5 files changed, 19 insertions(+), 1 deletions(-) commit a2b82120c0ad97811a8db3212a3a6589b98bd04f Author: greg Date: Thu Mar 5 20:36:44 2009 +0000 Scale shadow displacement and blur size like border size. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28819 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit c23a1cdfb356bbf39a95ca8ee7bf6fbc8938d061 Author: greg Date: Thu Mar 5 20:36:41 2009 +0000 Round shadow displacement to nearest int. Use double for shadow displacement parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28818 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit a2020815ad088b6bed0329b04a8355388b6411e7 Author: greg Date: Thu Mar 5 20:36:39 2009 +0000 Support a vsfilter special case: If PlayResX or Y is 1280/1024 respectively and the other PlayRes attribute isn't provided, use 1280/1024 for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28817 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) commit 153e7ada4c60f2547f3b40828b8a0f86ba12384d Author: greg Date: Thu Mar 5 20:36:35 2009 +0000 Hack: half-merge glyph border with outline to avoid ugly anti-aliasing in certain situations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28816 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 95dac90527e8761af4e959dc08cfcccda8ae6303 Author: diego Date: Thu Mar 5 20:25:54 2009 +0000 Simplify some vidix dhahelper build commands with automatic make variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28815 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) commit 16731f634912b601b7fdd5278b27c8b9888a933e Author: greg Date: Thu Mar 5 20:05:56 2009 +0000 Ignore PlayResX/Y aspect ratio for font aspect ratio. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28814 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit 020d0923b04485969a8a868b14403a7c8568903c Author: Gabrov Date: Thu Mar 5 19:46:08 2009 +0000 synced with r28807 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28813 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit c368fe2c764c60e8c3628dbba71561dd5a15d5fc Author: diego Date: Thu Mar 5 19:00:36 2009 +0000 mphq now runs Subversion 1.5. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28812 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/svn-howto.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8831008bb5d6d2e36b5e577043a77a801814aac1 Author: reimar Date: Thu Mar 5 12:25:10 2009 +0000 full_buffers and buffered_bytes must be volatile because they are used from different threads, hopefully this fixes an uninit hang. The code still relies on luck for thread-safety though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28811 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_win32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 3b0f23d1cfa33596e554e1d3662db3daa6f02b46 Author: bircoph Date: Thu Mar 5 07:00:45 2009 +0000 Synced with r28807. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28810 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/ru/mplayer.1 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 81ce92ba78ab92dc5714a30fa679ed947212609c Author: reimar Date: Wed Mar 4 19:37:07 2009 +0000 Make sure all output_surfaces are initialized in preinit. Patch by Dan Oscarsson [Dan Oscarsson (at) tietoenator com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28809 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a0b901212b477895579591423b8a7408c11d8a0e Author: sdrik Date: Wed Mar 4 19:12:49 2009 +0000 Rewrite of rgb15to32 and rgb16to32 using fewer asm instructions and setting alpha channel to 0xFF git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28808 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/rgb2rgb_template.c | 61 +++++++++++++++------------------------- 1 files changed, 23 insertions(+), 38 deletions(-) commit a88f28b4835538851d5e6c3a76ec2e96fda34175 Author: cehoyos Date: Wed Mar 4 18:07:34 2009 +0000 10l: Fix max value for -vo vdpau:deint. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28807 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 76f7f3aa0d4447ab14aeeff9056e168db6bb6bca Author: reimar Date: Wed Mar 4 08:37:54 2009 +0000 Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight right when we were in fullscreen mode and stay there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28806 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/x11_common.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit f31339b75b176b6c0fb141a9506017b071a31a66 Author: reimar Date: Wed Mar 4 08:11:42 2009 +0000 Fix mp_msg call with too few arguments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28805 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_ts.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit db234369ff51a50e4e4c00f5f8a6fee00d7f7eeb Author: henry Date: Tue Mar 3 19:47:23 2009 +0000 remove the rest of x86 asm from LGPL build git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28804 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 2e1f8e367040c2d81734b7a555b1121806305dc6 Author: reimar Date: Tue Mar 3 18:12:03 2009 +0000 100l, remove a pointless opt = NULL assignment that made print_int crash since r28794 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28803 b3059339-0415-0410-9bf9-f77b7e298cf2 m_option.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit fffc93fd94ac22da558cc4e94ef23284eb4fe58f Author: diego Date: Tue Mar 3 16:17:11 2009 +0000 Add back mistakenly removed copyright notice. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28802 b3059339-0415-0410-9bf9-f77b7e298cf2 osdep/getch2.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 0f43db17696a857880fb3e639d09aea03c4c0331 Author: reimar Date: Tue Mar 3 13:38:33 2009 +0000 Add another hack to work-around the currently completely inconsistent way in which libavcodec sets AVCodecContext::pix_fmt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28801 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 380d3ce69671ab04329234e34b0f2e54a72c2590 Author: Gabrov Date: Tue Mar 3 09:19:35 2009 +0000 synced with r28788 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28800 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 5e90dfdf28ab803ab0e6210b560d486d9572f1c4 Author: gpoirier Date: Mon Mar 2 21:01:46 2009 +0000 sync w/ r28788 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28799 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/fr/mplayer.1 | 71 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 64 insertions(+), 7 deletions(-) commit 307f6059dce9df8deb73f564e0b65b4b74d3f3fb Author: gpoirier Date: Mon Mar 2 19:52:52 2009 +0000 sync w/r28707 Patch by %Cedric P Dumez-Viou A obs-nancay P fr% git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28798 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/fr/faq.xml | 362 +++++++++++++++++++++++++++------------------------ 1 files changed, 190 insertions(+), 172 deletions(-) commit c1a6fa73a69e335f11d3e5418af096b9eeb2ee21 Author: gpoirier Date: Mon Mar 2 19:42:11 2009 +0000 french punctuation cosmetics Patch by %Cedric P Dumez-Viou A obs-nancay P fr% git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28797 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/fr/ports.xml | 99 ++++++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 50 deletions(-) commit 5004e3710b20a842dd0f2a966a9fa8a64393a401 Author: gpoirier Date: Mon Mar 2 17:15:46 2009 +0000 - french punctuation cosmetics that was done weeks before. - sync with r23520 Patch by %Cedric P Dumez-Viou A obs-nancay P fr% git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28796 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/fr/radio.xml | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) commit 8864662b13e9f621209d7b92d763a0641b6907ef Author: reimar Date: Mon Mar 2 11:24:20 2009 +0000 Make WinID a 64 bit integer, this should avoid issues with valid Window handles on windows being interpreted as "no wid set". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28795 b3059339-0415-0410-9bf9-f77b7e298cf2 cfg-mplayer.h | 2 +- libvo/video_out.c | 2 +- libvo/video_out.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 39bb720ef8418d1c0db87b773f5467b16b395d96 Author: reimar Date: Mon Mar 2 11:17:50 2009 +0000 Add a 64 bit integer type to the suboption parser. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28794 b3059339-0415-0410-9bf9-f77b7e298cf2 m_option.c | 22 +++++++++++++++++++++- m_option.h | 2 ++ 2 files changed, 23 insertions(+), 1 deletions(-) commit b9102d0b06e8f7cd9c0c4d762a09af3bdf292a19 Author: reimar Date: Mon Mar 2 11:10:11 2009 +0000 Use strtoll in parse_int to avoid discrepancies between 32 and 64 bit systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28793 b3059339-0415-0410-9bf9-f77b7e298cf2 m_option.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 3dbe44fc070dafb1aadfb8c299afe5f82a617f77 Author: reimar Date: Mon Mar 2 11:06:05 2009 +0000 Minor cosmetics: fix indentation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28792 b3059339-0415-0410-9bf9-f77b7e298cf2 m_option.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 552052f95181cb66930b18709b4af849d3b33bb2 Author: compn Date: Mon Mar 2 02:40:21 2009 +0000 import ffmpeg changelog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28791 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 71 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 58 insertions(+), 13 deletions(-) commit 9b649dd7d9fa861a9af68cb0b8dbe22e79167d5b Author: bircoph Date: Mon Mar 2 02:39:40 2009 +0000 Synced with r28788. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28790 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/ru/mplayer.1 | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) commit cef4012d5f08cc8352065099b22cce5dc97cb4f0 Author: compn Date: Mon Mar 2 02:05:32 2009 +0000 changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28789 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 5eb241bebf84b87bd6dd74a6dcb60e63e78817f2 Author: cehoyos Date: Sun Mar 1 20:40:38 2009 +0000 Improve vdpau deinterlacing documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28788 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 20a2db7dfda07b47661dae79a3951af0fb8bc00d Author: eugeni Date: Sun Mar 1 19:31:29 2009 +0000 Fix a memory leak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28787 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit ebe16af2c74dfe2850457a05a25d1d05a8f5f7b3 Author: reimar Date: Sun Mar 1 19:11:46 2009 +0000 Document that -heartbeat-cmd is only for video, not audio-only (should this be changed?) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28786 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 1c2080d5a9fa0fac056387bdb975503fb0189988 Author: diego Date: Sun Mar 1 17:53:06 2009 +0000 Use UTF-8 as character set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28785 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/codecs-in.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 628e1b481388b9521dd0e678e1e5d24e8883c2b3 Author: diego Date: Sun Mar 1 17:48:05 2009 +0000 cosmetics: Remove trailing whitespace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28784 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/codecs-in.html | 50 +++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 25 deletions(-) commit 9c8a334cc5ba98c60dfce3aad490a80b1727ea50 Author: eugeni Date: Sun Mar 1 16:01:24 2009 +0000 With pan-and-scan, keep positioned events in their original positions relative to video. Patch by Grigori Goronzy (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28783 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit abb8f13f7f2e38e91c76bc515b0ee5525aee7f15 Author: diego Date: Sun Mar 1 15:55:20 2009 +0000 Remove unnecessary linking hack, compilation works fine without. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28782 b3059339-0415-0410-9bf9-f77b7e298cf2 codec-cfg.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) commit 6d7d713ac977be6f91bdc987d79a537a4d129c91 Author: diego Date: Sun Mar 1 15:51:43 2009 +0000 Remove now unnecessary linking hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28781 b3059339-0415-0410-9bf9-f77b7e298cf2 TOOLS/subrip.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) commit 00b4789f650d25851fe34462f8a3dd991be620a9 Author: cehoyos Date: Sun Mar 1 15:00:38 2009 +0000 Mention VDPAU in Changelog. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28780 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 86a2eadf4c5a610177fd290f588713d9714d11b2 Author: diego Date: Sun Mar 1 13:13:25 2009 +0000 Add standard license headers to files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28779 b3059339-0415-0410-9bf9-f77b7e298cf2 osdep/getch2-win.c | 21 ++++++++++++++++++++- osdep/getch2.c | 23 ++++++++++++++++++++++- osdep/getch2.h | 22 ++++++++++++++++++++-- osdep/gettimeofday.c | 18 ++++++++++++++++++ osdep/glob-win.c | 18 ++++++++++++++++++ osdep/glob.h | 18 ++++++++++++++++++ osdep/keycodes.h | 22 +++++++++++++++++++++- osdep/macosx_finder_args.c | 18 ++++++++++++++++++ osdep/mmap_anon.c | 18 ++++++++++++++++++ osdep/mmap_anon.h | 18 ++++++++++++++++++ osdep/mplayer.rc | 23 +++++++++++++++++++---- osdep/setenv.c | 20 +++++++++++++++++++- osdep/shmem.c | 25 ++++++++++++++++++++----- osdep/shmem.h | 18 ++++++++++++++++++ osdep/strsep.c | 20 +++++++++++++++++++- osdep/swab.c | 18 ++++++++++++++++++ osdep/timer-linux.c | 21 ++++++++++++++++++++- osdep/timer-win2.c | 20 +++++++++++++++++++- osdep/timer.h | 18 ++++++++++++++++++ osdep/vsscanf.c | 22 ++++++++++++++++++++-- 20 files changed, 381 insertions(+), 20 deletions(-) commit 75a85ddb24cf7e7b60853b3ed9eb8e62a3059df9 Author: Gabrov Date: Sun Mar 1 12:25:31 2009 +0000 synced with r28775 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28778 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) commit 014b0d3f51a1d161c63dbbdb16174ea578d53b42 Author: rathann Date: Sun Mar 1 11:43:56 2009 +0000 Fix typo in comments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28777 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb_vis.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 824077b9879ae9fd9d590cb37818f0e58e2db89f Author: reimar Date: Sun Mar 1 11:38:46 2009 +0000 Add warnings to yuv2rgb_vis.c because alpha is set wrong (0 instead of 255). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28776 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb_vis.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 23599b030c87c64c5c4cdb0e9a96338ef230a18b Author: diego Date: Sun Mar 1 11:36:39 2009 +0000 DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 1 + DOCS/man/en/mplayer.1 | 12 ++ Makefile | 1 + configure | 29 +++++ libao2/ao_dart.c | 334 +++++++++++++++++++++++++++++++++++++++++++++++++ libao2/audio_out.c | 4 + 6 files changed, 381 insertions(+), 0 deletions(-) commit fb888843d85ed7350fc3f6b2cb91273cc503d878 Author: reimar Date: Sun Mar 1 11:35:00 2009 +0000 Make AltiVec code write alpha as 255 instead of 0 when converting to RGBA git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28774 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb_altivec.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 25a27fd17aa7a3791a370b3afcf44b9d0b4db86b Author: reimar Date: Sun Mar 1 11:33:10 2009 +0000 Fix braindead and broken way to calculate abase, fixes regression tests on big-endian systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28773 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c003bcdcabbae1f799ad7c6309e9a09b1e8c02c7 Author: diego Date: Sun Mar 1 11:22:31 2009 +0000 Fix 10l typo in ADD_ALL_EXESUFS function name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28772 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e96ebebaf0fd002a62f9b4ed3d6d780a2c6bf6e2 Author: diego Date: Sun Mar 1 11:07:05 2009 +0000 codec-cfg does not depend on codecs.conf.h, it is used to generate it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28771 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3c3495a1227408c2523242911fd6c8282afbe94c Author: diego Date: Sun Mar 1 11:03:18 2009 +0000 Make all object files depend on generated header files. This solution does not record precise dependencies but is robust against header dependency changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28770 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit 48d2eb7209bbb1aa173732584cd5b2c08b297ab1 Author: diego Date: Sun Mar 1 10:53:37 2009 +0000 Add explicit dependencies on generated header files for the object files along with the dependency information files. This fixes a straight build without generating dependency information. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28769 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit b63817b21557652d60707bc4e1ebb4111f4ec880 Author: diego Date: Sun Mar 1 10:52:26 2009 +0000 Fix dependencies on generated header files for the codec* binaries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28768 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit aacd0815797c8eb9fc7c5d15fa3f0e5273487ab9 Author: reimar Date: Sun Mar 1 09:09:49 2009 +0000 10l, replace a tab that slipped in. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28767 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1002389056f2540b9f78996d1a6e7e4e78b31c6e Author: reimar Date: Sun Mar 1 09:03:01 2009 +0000 Create a set_format_params function that sets all the special options needed for XvMC/VDPAU acceleration in a single place. This should get closer to working with selecting acceleration via pix_fmt instead of via a special codec for each method. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28766 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) commit 838d841f763ab67d89f9a458793326290a63a958 Author: jrash Date: Sun Mar 1 06:45:27 2009 +0000 sync with en/mplayer.1 r28745 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28765 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 116 ++++++++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 39 deletions(-) commit 40fb81669a899c7948f2c20a1a71be60720dbfe9 Author: cehoyos Date: Sat Feb 28 15:45:24 2009 +0000 Use M_PI for pi. Suggested by Reimar. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28764 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit f09943179133a04bdfec2a00cee4eb5e30293e2f Author: cehoyos Date: Sat Feb 28 15:42:17 2009 +0000 Make VdpVideoMixerAttribute attributes[] static const. Suggested by Reimar. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28763 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8a70695df94f684e979c1e449aa2b77880c971e8 Author: Gabrov Date: Sat Feb 28 15:40:20 2009 +0000 synced with r28745 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28762 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) commit d20b0f308143ecbb86e55f81802a9eceab309f2e Author: diego Date: Sat Feb 28 14:11:42 2009 +0000 sync by Ivan (sevenfourk, sevenfourk gmail com) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28761 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-uk.h | 640 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 451 insertions(+), 189 deletions(-) commit 82ed008f7abf69a9716dbc873932d7c93e149a3f Author: cehoyos Date: Sat Feb 28 13:20:01 2009 +0000 Support brightness, contrast, hue and saturation adjustments via custom color space conversion matrices in VDPAU. Patch by Grigori Goronzy, greg A chown D ath D cx git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28760 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 2 deletions(-) commit 2661a2b7fce22956c59dfe1638c95d818efa30d3 Author: cehoyos Date: Sat Feb 28 13:02:52 2009 +0000 Fix OSD for vo vdpau:deint>1. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28759 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 5437a538d5302af25a175f71dcba746aa1cd086a Author: reimar Date: Sat Feb 28 10:43:28 2009 +0000 Handle vdp_decoder_create failures better, in particular avoid unrelated error messages and retry creating a decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28758 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit d1acb189028448087cee36a78d0b64b024422966 Author: reimar Date: Sat Feb 28 10:06:52 2009 +0000 Fix a possible NULL-pointer crash introduced by local changes to libfaad2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28757 b3059339-0415-0410-9bf9-f77b7e298cf2 libfaad2/local_changes.diff | 5 +++-- libfaad2/specrec.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) commit 3a81bf82a0415753790c8fc09e8020d6e0e22f67 Author: sdrik Date: Sat Feb 28 08:01:52 2009 +0000 When converting from a non alpha format to an alpha format, defaults to all ones rather than all zeroes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28756 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/rgb2rgb.c | 13 +++++++------ libswscale/rgb2rgb_template.c | 22 +++++++++++----------- libswscale/swscale.c | 8 ++++---- libswscale/swscale_template.c | 27 ++++++++++++++------------- libswscale/yuv2rgb.c | 5 +++-- libswscale/yuv2rgb_template.c | 2 +- 6 files changed, 40 insertions(+), 37 deletions(-) commit 0c6f667896620943ee6ae899d6e36c3da5c98c54 Merge: 54bb7a2... cde07e8... Author: Uoti Urpala Date: Sat Feb 28 05:58:59 2009 +0200 Merge svn changes up to r28755 commit cde07e8a61ba78a8c35b1548181c1e1fd43215d9 Author: bircoph Date: Sat Feb 28 03:12:55 2009 +0000 Synced with r28745. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28755 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/ru/mplayer.1 | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) commit 15ed6e01992e071a88674be5e3ce6be121e98555 Author: eugeni Date: Fri Feb 27 23:06:53 2009 +0000 Zero-fill glyph_info_t before use. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28754 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 69ce550ee038d7babc341637e5adb130b9750e4e Author: eugeni Date: Fri Feb 27 23:06:50 2009 +0000 Remove unused function argument. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28753 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 80 +++++++++++++++++++++++++------------------------- libass/ass_utils.c | 4 +- libass/ass_utils.h | 4 +- 3 files changed, 44 insertions(+), 44 deletions(-) commit 00d6bb12b9c499db81d2e2599fcbc63424d833d3 Author: eugeni Date: Fri Feb 27 23:06:47 2009 +0000 Support fractional arguments for some override tags. Done by parsing all integers as doubles first and then converting them to the nearest integer. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28752 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 46 +++++++++++++++++++++++++--------------------- libass/ass_utils.c | 15 ++++++++++++++- libass/ass_utils.h | 1 + 3 files changed, 40 insertions(+), 22 deletions(-) commit a1f50bf3484c4dff9ee562a7d7ca206c4eda37fc Author: eugeni Date: Fri Feb 27 23:06:43 2009 +0000 Fix two gcc warnings. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28751 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit bcad979a5621487d197eba154f758e1a93ae7556 Author: eugeni Date: Fri Feb 27 23:06:40 2009 +0000 Fix memory leak produced by the \blur patch. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28750 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b84c1b627f43dcf87fa5ce971042a9309a4c27c6 Author: eugeni Date: Fri Feb 27 23:06:37 2009 +0000 Stronger blur. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28749 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 909f7b0c14d6e3e3674a9fde08d2746704b236f0 Author: eugeni Date: Fri Feb 27 23:06:34 2009 +0000 Allow shadow without border. Patch by Grigori G (greg chown ath cx). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28748 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_render.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) commit f3ea1ffd7b86ce7143e17e3cc070f4fabcd13d7e Author: sdrik Date: Fri Feb 27 22:23:20 2009 +0000 Add an isALPHA macro to check if pixel format has alpha channel git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28747 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 255c11b7452b5ef63d6850f70c9aa3a61bc32219 Author: sdrik Date: Fri Feb 27 22:13:55 2009 +0000 Use YUV420P code path for YUVA420P where appropriate git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28746 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 34fdebf9687c9138d7816d84530782b10db818e8 Author: cehoyos Date: Fri Feb 27 22:13:39 2009 +0000 Update vdpau:deint documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28745 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit b739f6921719abc0eef34014d0f49ae85dac20dc Author: cehoyos Date: Fri Feb 27 21:55:28 2009 +0000 Do not forget the chosen deinterlacer for -vo vdpau. Make temporal deinterlacing standard when pressing "D" to activate deinterlacer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28744 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 7c186eed152dcd69dfd68dcd600cae2c10d5dd4b Author: cehoyos Date: Fri Feb 27 21:52:59 2009 +0000 Add one-field-only output for -vo vdpau. Change syntax of -vo vdpau:deint for the last time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28743 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) commit 317b16725cdddf79adb46fbbcf96b3c0e1ae889e Author: cehoyos Date: Fri Feb 27 21:46:13 2009 +0000 Document that all vdpau deinterlacers respect -field-dominance. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28742 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f9d981ad9257ebd23c02c7e0904b7d443ea68eba Author: cehoyos Date: Fri Feb 27 20:44:59 2009 +0000 Refactor code for upcoming alpha patches. Patch by Cédric Schieli, cschieli A gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28741 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb_template.c | 82 +++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 40 deletions(-) commit c9a3957279ef16e7b0457b648606d9e89884ede9 Author: cehoyos Date: Fri Feb 27 16:44:28 2009 +0000 vdpau:pullup only works with temporal and temporal-spatial deinterlacing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28740 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 186c10f836566db7d28aa1286a039f7b2755de6a Author: Gabrov Date: Fri Feb 27 10:55:25 2009 +0000 synced with r28736 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28739 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 65da28a88d103b50673a9444d118e40e334ff166 Author: kraymer Date: Thu Feb 26 23:32:37 2009 +0000 r27801 Clarify screenw/screenh options, patch by Christian Ohm, chr.ohm gmx net. r27872 Add a few more supported URL protocols r27895 Fix typo in psy-rd x264 option description. r27906 document x264's option subq=0, plus a bit of factoring and added details r27973 add direct3d docs, ok'd by Guillaume r27979 Make description of the option more clear r28056 Add a note about some known issues with -vo sdl r28095 Document missing vo_gl suboptions r28096 Using rectangle=2 for vo_gl is probably a good idea nowadays. r28126 Add support for writing PNG files with alpha channel in -vo png git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28738 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/de/mplayer.1 | 68 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 50 insertions(+), 18 deletions(-) commit cd1dc957febe04b59ac6d6633211c51e3aa552dc Author: cehoyos Date: Thu Feb 26 19:34:04 2009 +0000 10l: Remove debug printf() from last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28737 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 2614be14cc819546c28a9204848ec3980789df4e Author: cehoyos Date: Thu Feb 26 18:20:32 2009 +0000 Support "D" to (de-)activate deinterlacing when using vo vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28736 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- libvo/vo_vdpau.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) commit 1a608bf2bdd574c7a2d2353f55ac354e3a43075d Author: cehoyos Date: Thu Feb 26 18:02:38 2009 +0000 Document that -field-dominance also works for vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28735 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 115c0fddae0176c9abf06d6eb3c3fa6579d96546 Author: cehoyos Date: Wed Feb 25 15:17:14 2009 +0000 10l: Add missing braces for VOCTRL_GET_EOSD_RES. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28734 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit e5294a43b95ca9472a0575ef309e9409a0f6119a Author: kraymer Date: Wed Feb 25 14:23:07 2009 +0000 r27390 Fix a misleading section in the libavcodec options manual r27407 Add video driver for Nintendo Wii/GameCube. r27454 Mention IVTV, S3 and SH_VEU drivers within VIDIX section of manpage. r27466 Document -lavcopts o, aka libavcodec AVOption. r27542 'mp3lame' audio output codec was wrongly listed as 'lame'. r27606 Make -heartbeat-cmd and -stop-xscreensaver sections reference each other. r27638 add lavfopts matroska suboption r27639 document lavc/lavf avoption o suboption r27650 add outdir sub-option to vo png r27690 whitespace cosmetics r27691 vo_fbdev now supports -geometry. r27768 update x264's section with r999 of x264 r27800 improve documentation of latest x264's options r27801 Clarify screenw/screenh options git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28733 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/de/mplayer.1 | 167 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 115 insertions(+), 52 deletions(-) commit 8605d7090e49358a534386140ab98ea359d7a8f5 Author: reimar Date: Wed Feb 25 12:51:20 2009 +0000 Use memset to make sure all parts of struct sockaddr_in are always initialized. Problem reported by [kmkaplan+mplayer-dev-eng (at) kim kim-minh com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28732 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_bl.c | 1 + stream/librtsp/rtsp_rtp.c | 2 ++ stream/udp.c | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) commit 99caf8cc681401665b5c3f3f49c015738be0be9f Author: reimar Date: Wed Feb 25 12:01:00 2009 +0000 Change code to actually work when NUM_OUTPUT_SURFACES is changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28731 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) commit 0806e4548ee90f5491c4213c113798b0ae853989 Author: Gabrov Date: Wed Feb 25 09:32:32 2009 +0000 synced with r28727 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28730 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 34 ++++++++++++++++++++++++++++++++-- DOCS/xml/hu/cd-dvd.xml | 16 ++++++++++++---- DOCS/xml/hu/faq.xml | 5 +++-- 3 files changed, 47 insertions(+), 8 deletions(-) commit dad4a11478e450f1a6d26ea62b769fb249e970f9 Author: Gabrov Date: Wed Feb 25 09:08:58 2009 +0000 copyright year update in man pages git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28729 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/cs/mplayer.1 | 2 +- DOCS/man/de/mplayer.1 | 2 +- DOCS/man/es/mplayer.1 | 2 +- DOCS/man/it/mplayer.1 | 2 +- DOCS/man/pl/mplayer.1 | 2 +- DOCS/man/zh_CN/mplayer.1 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) commit 54bb7a2582ce084895dcd0c6511dda4baf9a6c0e Merge: 66f6f9f... d1e6b23... Author: Uoti Urpala Date: Wed Feb 25 05:03:51 2009 +0200 Merge svn changes up to r28728 commit d1e6b2360c90db4293f3ff40a92c8e4dfa331679 Author: diego Date: Tue Feb 24 23:15:26 2009 +0000 Read revision string from the file snapshot_version if available. This will be used by daily snapshots without Subversion metadata. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28728 b3059339-0415-0410-9bf9-f77b7e298cf2 version.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 08ac7b59a35342d94d220e8e010c7b9684cfd16b Author: cehoyos Date: Tue Feb 24 23:01:06 2009 +0000 Document -vo vdpau:pullup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28727 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 9e8a06bc4e1731a4b3cef61b2818cef130b27f74 Author: diego Date: Tue Feb 24 22:57:55 2009 +0000 cosmetics: Use $() instead of ``, the former can be nested more easily. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28726 b3059339-0415-0410-9bf9-f77b7e298cf2 version.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 8fe1d4ce2eafe1cec689d19644f8a07878ce7956 Author: cehoyos Date: Tue Feb 24 22:57:42 2009 +0000 Document -vo vdpau:deint. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28725 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) commit 4cd920182b5e0e8b65b7fdd7cbea8f002302132a Author: cehoyos Date: Tue Feb 24 22:45:29 2009 +0000 Cosmetics: Fix indentation and line length. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28724 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) commit e1724e3000b9f37af6f14b42910bb4a05d797147 Author: diego Date: Tue Feb 24 22:40:20 2009 +0000 Rename yuv2rgb2.c --> yuv2rgb.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28723 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/Makefile | 2 +- libswscale/yuv2rgb.c | 683 +++++++++++++++++++++++++++++++++++++++++++++++++ libswscale/yuv2rgb2.c | 683 ------------------------------------------------- 3 files changed, 684 insertions(+), 684 deletions(-) commit 1ae523f93d199b45169b6b0d5b853b022ec57e09 Author: cehoyos Date: Tue Feb 24 22:11:37 2009 +0000 Clarify -vo vdpau:sharpen. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28722 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 1440333b8a3b8ef8a5e520d892000915c510a53e Author: cehoyos Date: Tue Feb 24 22:09:51 2009 +0000 Document -vo vdpau:denoise. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28721 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit b92943212725a7e49247c6fbc6b50a044f32485e Author: cehoyos Date: Tue Feb 24 22:06:14 2009 +0000 Document -vo vdpau:sharpen. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28720 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 4cfb4ba7d8cbd73b65a53722072dd6593bf55ac2 Author: cehoyos Date: Tue Feb 24 21:46:25 2009 +0000 Enable Bob de-interlacing for VDPAU. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28719 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) commit 48833d442fe73e553a4e7a5c92b2839aa7a25d38 Author: kraymer Date: Tue Feb 24 19:28:14 2009 +0000 version bump contains some cosmetics from several in-between revisions git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28718 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-de.h | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) commit b699efe1a6e091d5a5fb3e0cf23e2ce21f3358a7 Author: diego Date: Tue Feb 24 15:27:14 2009 +0000 Relicense AltiVec optimizations as LGPL with the permission of Marc Hoffman and Reza Jelveh, the original authors. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28717 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb_altivec.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) commit 9e540cc70843a6f6e7318ab308df8c6bf357a1b9 Author: diego Date: Tue Feb 24 14:50:28 2009 +0000 Remove GPL version of yuv2rgb.c that has been replaced by an LGPL substitute. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28716 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb.c | 780 -------------------------------------------------- 1 files changed, 0 insertions(+), 780 deletions(-) commit 46c3db39cea262c1bae1344af7ad036af84e6f8e Author: jrash Date: Mon Feb 23 22:30:53 2009 +0000 add Zhu Tian (JRaSH) as Chinese document translator git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28715 b3059339-0415-0410-9bf9-f77b7e298cf2 AUTHORS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit f03424a37f56008087f514624ba525552c916d0a Author: jrash Date: Mon Feb 23 22:27:28 2009 +0000 sync with en/mplayer.1 r28576 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28714 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 242 +++++++++++++++++++++++++++++++++------------- 1 files changed, 173 insertions(+), 69 deletions(-) commit 72dabb0ed90688d52f7d4811f85e6342e110316e Merge: 8438ef1... 66f6f9f... Author: Uoti Urpala Date: Mon Feb 23 21:02:47 2009 +0200 Merge branch 'master' into mt commit 66f6f9f0768de5b003fc1b0fa9b1ea428466308a Merge: ebb541c... 30aa238... Author: Uoti Urpala Date: Mon Feb 23 21:00:52 2009 +0200 Merge svn changes up to r28712 commit 8438ef106ad91875ba183217744ebcbddd144a65 Merge: a5d1dbc... ebb541c... Author: Uoti Urpala Date: Sat Feb 21 19:13:52 2009 +0200 Merge branch 'master' into mt commit ebb541c6553af10203b2c2f5bcead6118a44f5be Merge: e46317a... a9abd00... Author: Uoti Urpala Date: Sat Feb 21 17:39:30 2009 +0200 Merge svn changes up to r28690 commit a5d1dbc0d134d35738538fe2b1dee60acd656193 Merge: bdeb227... e46317a... Author: Uoti Urpala Date: Thu Feb 19 05:19:43 2009 +0200 Merge branch 'master' into mt, update FFmpeg-mt submodule commit e46317a1db077a7f92ea5db7bb76e6cc899f1a64 Merge: 186e5a9... 908286b... Author: Uoti Urpala Date: Thu Feb 19 03:23:50 2009 +0200 Merge svn changes up to r28655 commit 186e5a998c8424b3c850b62d6f5755a0928cd64c Merge: 41ac08d... e5ee123... Author: Uoti Urpala Date: Wed Feb 18 01:07:37 2009 +0200 Merge svn changes up to r28641 Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions. commit 41ac08d2b45f0f6eb369ea57604796be69200185 Author: Uoti Urpala Date: Mon Feb 16 23:16:11 2009 +0200 options: fix -ar default back to enabled if available Due to a missed config variable rename -noar was always the default. Make it default to enabled if available as it was before. defaultopts.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0bf2bd91ec69dfd908d78557a17f38e0904a52e7 Merge: 738f66b... eacf442... Author: Uoti Urpala Date: Mon Feb 16 02:39:58 2009 +0200 Merge svn changes up to r28610 commit 738f66b1bc98073d74af7031c4454322157a15ec Merge: 1e86963... 9f8792e... Author: Uoti Urpala Date: Fri Feb 13 03:52:51 2009 +0200 Merge svn changes up to r28549 commit 1e869638280f962fb80f372d152234f21246c2af Merge: 9790f4e... 379b176... Author: Uoti Urpala Date: Thu Feb 12 04:17:55 2009 +0200 Merge svn changes up to r28537 commit 9790f4e6e72cdc8093be966d3d6e007c8f44a035 Merge: ccf4d9e... 09bf506... Author: Uoti Urpala Date: Wed Feb 4 00:28:17 2009 +0200 Merge svn changes up to r28461 commit ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 Merge: 03aa646... 0e77da2... Author: Uoti Urpala Date: Sat Jan 31 04:52:15 2009 +0200 Merge svn changes up to r28403 commit 03aa64687fc109c5f2346a3c191b70698b333509 Merge: dd888b0... 7034529... Author: Uoti Urpala Date: Mon Jan 26 01:57:38 2009 +0200 Merge svn changes up to r28368 Fixes af_format.c compilation bug exposed by latest FFmpeg change. commit dd888b05ff3af1c6c35582e75bedae687d38fc66 Merge: 0406d95... 85b28eb... Author: Uoti Urpala Date: Mon Jan 26 00:58:15 2009 +0200 Merge svn changes up to r28366 Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c commit bdeb2271bb5ad3940bb7ce34adc1552d4dcd6be6 Merge: 6192b07... 0406d95... Author: Uoti Urpala Date: Fri Jan 23 20:57:48 2009 +0200 Merge branch 'master' into mt commit 0406d951209df261970424256d76f293649ec140 Merge: 79e1aa7... 39b7c15... Author: Uoti Urpala Date: Fri Jan 23 20:56:50 2009 +0200 Merge svn changes up to r28348 commit 6192b07d8594d84c39ef7d78ec6c49c44185e290 Merge: fbaf881... 79e1aa7... Author: Uoti Urpala Date: Fri Jan 23 00:09:02 2009 +0200 Merge branch 'master', update FFmpeg-mt Update both MPlayer and the FFmpeg-mt submodule to versions with changed FFmpeg config variable semantics. commit 79e1aa7cc7a9ac695c3af361bca72013ef272885 Merge: 3ba97da... 39cb032... Author: Uoti Urpala Date: Mon Jan 19 00:04:43 2009 +0200 Merge svn changes up to r28341 Conflicts: configure libmpcodecs/native/rtjpegn.c commit 3ba97da297e1e1a5ca9dabdda60cc6a62f77affc Author: Uoti Urpala Date: Sun Jan 18 17:17:57 2009 +0200 configure: Make --enable-gui print an error Since compilation with GUI enabled will not succeed, make the configure option return an error immediately instead of triggering an obscure compiler error later. configure | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit fbaf88100032ffd6536ed75b24c12b9f2814ac25 Author: Uoti Urpala Date: Fri Jan 16 12:33:19 2009 +0200 Update to latest FFmpeg-mt ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit dc3eab332f571946e6a492d542971a309af6ed21 Author: Uoti Urpala Date: Fri Jan 16 12:30:05 2009 +0200 Fix possible audio stutter when playing audio-only files The same fix already exists in svn but merging would bring in changes incompatible with current ffmpeg-mt. mplayer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 04618813338933f4841824607235e07e735b75b9 Merge: f217971... 2b45912... Author: Uoti Urpala Date: Fri Jan 16 12:29:28 2009 +0200 Merge branch 'master' into mt commit 2b45912684f9e383e5cebb56c1b4e712f90b67cc Author: Uoti Urpala Date: Thu Jan 15 06:00:38 2009 +0200 Fix dvdnav call broken in pause changes mplayer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9bcd12fdf5c6f85e9bb391caa2713021624a957e Merge: d419ecd... e0d66b1... Author: Uoti Urpala Date: Thu Jan 15 05:07:09 2009 +0200 Merge svn changes up to r28310 The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn. commit e0d66b140e1da7a793bff15003cadab79544b1dd Author: Uoti Urpala Date: Thu Jan 15 01:11:47 2009 +0200 Revert OSD flicker fixes done better in another branch Revert three commits from svn before merging other svn changes to another branch. That branch has better fixes for these issues and the commits would only cause conflicts. The reverted commits are: "Avoid flickering OSD with -vf yadif=1" commit 5904de25e3b78b78ca6ea81e18d436377d426a43 "Fix OSD flicker with tfields as well." commit 8385fa3dc62b51e3395c6206b0901f2e909b8f57 "Fix OSD flickering with filters that add frames (tfields, yadif) and" commit 17ea23ac7467a26aa0919deae506c15641c03afb libmpcodecs/vf.c | 14 -------------- libmpcodecs/vf.h | 1 - libmpcodecs/vf_tfields.c | 6 +++--- libmpcodecs/vf_yadif.c | 2 +- 4 files changed, 4 insertions(+), 19 deletions(-) commit d419ecd161634e79dab3ac57d57c4bccba2adcdc Author: Uoti Urpala Date: Thu Jan 15 01:07:12 2009 +0200 OSD: Ensure that OSD content is drawn in filter-added frames Move the OSD drawing calls from filter_video() to higher-level code to ensure that VOs will draw the OSD also in filter-added frames, which are displayed without a separate call to filter_video(). libmpcodecs/dec_video.c | 9 +-------- libmpcodecs/dec_video.h | 3 +-- mencoder.c | 14 ++++++++++++-- mplayer.c | 12 +++++++----- 4 files changed, 21 insertions(+), 17 deletions(-) commit 2d532689fcc96deaa8ae8c05c34e315cfcef8350 Author: Uoti Urpala Date: Thu Jan 15 00:32:03 2009 +0200 core: Improve handling of bad timestamps Rewrite some of the -correct-pts frame generation code. The most noticeable difference is that video timestamps which jump around but do not go backwards more than 0.5 seconds will not affect overall video playback speed. Only larger jumps are treated as timestamp resets and increase the overall length of the video timeline. This will hopefully give watchable results for videos which have broken timestamps or which MPlayer does not demux or otherwise handle properly. mplayer.c | 132 +++++++++++++++++++++++++++++------------------------------- 1 files changed, 64 insertions(+), 68 deletions(-) commit 02bc48b67dd88c974c8f9298a0c50cbfcd51af41 Merge: c1b80dc... 38a76f7... Author: Uoti Urpala Date: Thu Jan 15 00:29:51 2009 +0200 Merge branch 'pause' commit 38a76f7fdf5c03bc49072b693d7c53b343f2994a Author: Uoti Urpala Date: Wed Jan 14 02:51:24 2009 +0200 core: Better -nocorrect-pts pause and filter-added frames handling Rewrite the -nocorrect-pts frame creation code. The new version always updates the visible frame when seeking while pausing, and supports filter-added frames. It can not time those properly though. Now the handling of filter-added frames in MPlayer always uses the new method independently of the value of correct-pts but MEncoder still expects the old behavior. Add a global variable that is set under MEncoder only and change the filters to choose behavior based on that instead of the correct_pts option. libmpcodecs/vf_tfields.c | 9 ++-- libmpcodecs/vf_yadif.c | 7 ++- mencoder.c | 1 + mplayer.c | 120 ++++++++++++++++++++++++++------------------- 4 files changed, 79 insertions(+), 58 deletions(-) commit 1f782eb802e9774bc53103e935eb673c283cf0aa Author: Uoti Urpala Date: Tue Dec 9 18:39:38 2008 +0200 core: Set OSD contents better while paused Handle timing out of OSD messages and set the OSD function symbol to pause instead of play. The implementation is hackish and should be cleaned up later with other pause loop changes. mplayer.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 8ed6d269779d8917492614ce8b204a712e311195 Author: Uoti Urpala Date: Tue Dec 9 17:31:01 2008 +0200 vo_gl: Support changing OSD over existing frame libvo/vo_gl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 321c93ee998266cff4ce5b5eff2aaba4e2311dd0 Author: Uoti Urpala Date: Mon Dec 8 20:04:08 2008 +0200 core: Rewrite some of the A/V sync related code Notable functionality changes: * Timing change between any two frames is now accurately limited to 1/10 of their nominal distance. Previous code did not always use the correct duration. * The status line now keeps showing the same A-V sync value from one video frame change to the next. Previously it kept recalculating the value using a new audio position but the same video position when the status line was updated between video frames. This incorrectly showed the video losing sync with audio. * The status line now displays actual measured A-V difference in autosync mode too. The previous code displayed values that completely ignored real timing in autosync mode, showing 0 A-V difference even when video was significantly behind audio due to inadequate decoding speed. The new behavior can make the shown A-V values appear more unstable if the audio out has unreliable delay measurements (the most likely reason to use autosync), but this is a display change rather than a timing quality change. * Autosync mode now tries to adjust timing by the amount of time vo_flip() calls take, so the calls start earlier and finish at the time the frame should be shown. Previously non-autosync mode adjusted for this but autosync did not. * The warning about the system being too slow to decode the video in realtime is now displayed in autosync mode too. mp_core.h | 20 ++++++++ mplayer.c | 149 ++++++++++++++++++++++++++++--------------------------------- 2 files changed, 88 insertions(+), 81 deletions(-) commit c1b80dcbbb34d63df65c0f52c0bede66dfa225e8 Merge: a76f59b... 4f6c6ba... Author: Uoti Urpala Date: Sat Dec 27 17:40:57 2008 +0200 Merge svn changes up to r28204 commit a76f59b0390a408de0a666cb1edfc578b734596a Author: Uoti Urpala Date: Sat Dec 27 16:46:38 2008 +0200 talloc.c: Update to match current upstream ("likely" macro definitions) Use the current macro definitions for likely/unlikely from Samba. The old version lacked parentheses around the non-GCC alternative, but there are no uses where this would actually make a difference. talloc.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) commit 64b22229e339bef4a3bc9d2a42529da9073a0674 Author: Uoti Urpala Date: Mon Dec 22 16:45:32 2008 +0200 Makefile: Fix live555 compilation The change to create .d files with .o incorrectly used CFLAGS instead of CXXFLAGS when compiling .cpp files. This broke the build if live555, which is the only part using C++ code, was enabled. Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9afb39ccff089c1269ab3bc7e519897d89b9c7a5 Author: Uoti Urpala Date: Mon Dec 22 00:16:51 2008 +0200 libass: If a bad subtitle has multiple \pos use first Having multiple \pos makes no sense, but such files exist. Apparently VSFilter uses the values from the first \pos in this case whereas libass used the last one. Change the behavior to make it compatible with VSfilter since this has the highest chance of matching what the creators of the file intended. libass/ass_render.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) commit 312d9e4b104741b834aa5d71b02228d0cd988a4e Author: Uoti Urpala Date: Sun Dec 21 23:32:07 2008 +0200 libass: Fix cache lookup problem causing memory bloat The cache code did hash lookups by storing key values in struct fields and then hashing and comparing the struct as a single memory block. In at least one case such a struct contained uninitialized padding bytes which prevented the complete memory area of the struct from matching even though the fields did. As a result the code failed to find existing objects in the cache and stored new versions of them, causing gigabytes of memory use in some circumstances. Initializing the struct memory to zero before writing the fields avoided such memory use in tests but is not guaranteed to work if I interpret the C standard correctly (the compiler is allowed to write garbage over padding bytes when changing struct member values). Change the code to use struct-specific hashing and comparison functions that work field by field to guarantee correct behavior. Create these by replacing the struct definition with a template that lists the fields and can be used the generate each of struct definition, hash function and compare function with some preprocessor magic (otherwise every field would need to be listed separately in all three). libass/ass_cache.c | 12 +++++- libass/ass_cache.h | 32 +-------------- libass/ass_cache_template.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 31 deletions(-) commit fccb0a7e45b61128262a396f2426bd7168fd198c Merge: 71b25cc... ce821bd... Author: Uoti Urpala Date: Mon Dec 22 00:46:02 2008 +0200 Merge svn changes up to r28176 Conflicts: libvo/video_out.c libvo/x11_common.c commit f217971c373a5cf9ac901663b6d1328408ee6377 Author: Uoti Urpala Date: Fri Dec 19 00:36:51 2008 +0200 Update to latest FFmpeg-mt ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b6088d6c6ac3eefaadb906335ffed6bb17306fc7 Merge: 68fbfaa... 71b25cc... Author: Uoti Urpala Date: Fri Dec 19 00:36:39 2008 +0200 Merge branch 'master' into mt commit 71b25cca7644ab059393e9ee4682d79aab41ceba Merge: a3ab9e8... b883075... Author: Uoti Urpala Date: Fri Dec 19 00:29:24 2008 +0200 Merge svn changes up to r28162 commit 68fbfaa245d0649bb327e5987f523ba79a3ae539 Merge: 80986a0... a3ab9e8... Author: Uoti Urpala Date: Sun Dec 14 17:30:36 2008 +0200 Merge branch 'master' into mt commit a3ab9e8e4649601281f78949e56b92755ae1142a Merge: f01f7f6... bac1f05... Author: Uoti Urpala Date: Sun Dec 14 17:28:16 2008 +0200 Merge svn changes up to r28149 commit 5204fda1213f1bb876fd71f16f44767edc8eae46 Author: Uoti Urpala Date: Tue Dec 2 01:02:52 2008 +0200 vo_xv: Always support updating OSD if none was drawn yet If the main image buffer was not altered for OSD then allow updating OSD even if no separate OSD-less copy was made. The code now makes a copy at that time (another possibility would be to not make a copy and disallow further updates). libvo/vo_xv.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) commit f01f7f6259badb2725be49af914d8db52e025cf6 Author: Uoti Urpala Date: Wed Dec 10 02:47:38 2008 +0200 ao_alsa: Sanity check get_space() return values better Sometimes after seek audio reset I see snd_pcm_status_get_avail() return huge values. get_space() already had a check againt the value being larger than the whole buffer; however since the unsigned value from the ALSA function had been cast to signed by that point it was interpreted as negative and the check didn't trigger. Use unsigned instead to make the check reliable and ensure the return value is sane. libao2/ao_alsa.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 02efad79a28345e5814af1b60e0bb3c40cb5a941 Author: Uoti Urpala Date: Mon Dec 1 19:53:57 2008 +0200 Update OSD while paused When OSD contents change while paused, try to change the OSD drawn in the currently visible frame. If such OSD updates are not supported then advance by one frame and draw the OSD normally. Add some support for OSD redrawing to vo xv. The new xv code makes a copy of the original frame contents before drawing the OSD if MPlayer is already paused when the frame is drawn. If such a copy of the current frame exists then the frame contents can be restored and a different OSD drawn on top of the same frame. command.c | 11 ++++-- libmpcodecs/dec_video.c | 9 +++++ libmpcodecs/dec_video.h | 1 + libmpcodecs/vf.h | 1 + libmpcodecs/vf_expand.c | 6 ++++ libmpcodecs/vf_vo.c | 3 ++ libvo/video_out.h | 2 + libvo/vo_xv.c | 75 +++++++++++++++++++++++++++++++++++++--------- mp_core.h | 1 + mplayer.c | 32 +++++++++++++++---- 10 files changed, 115 insertions(+), 26 deletions(-) commit 95f35c4d205daafe4797f28d7ec79f3ebb1952a1 Author: Uoti Urpala Date: Mon Dec 1 16:15:17 2008 +0200 vo_xv: Reformat code Reformat vo_xv.c completely to K & R style and remove a couple of outdated comments. libvo/vo_xv.c | 489 ++++++++++++++++++++++++++------------------------------- 1 files changed, 221 insertions(+), 268 deletions(-) commit 6fec7ec734c25424e268465ae806063273c4e5be Author: Uoti Urpala Date: Sun Nov 30 03:19:46 2008 +0200 Allow seeking while paused Screen is now updated immediately (doesn't always work without correct-pts yet though). Doing audio unpause after the seek reset can display errors. Main loop code now checks for possible reasons to stop command processing instead of relying on each command to also set an explicit 'break' flag. command.c | 11 +---------- command.h | 2 +- mplayer.c | 33 ++++++++++++++++----------------- 3 files changed, 18 insertions(+), 28 deletions(-) commit 77c709ad31ebe997dbd824506c145a0ac24581d0 Author: Uoti Urpala Date: Sat Nov 29 08:09:57 2008 +0200 Start pause handling changes Add separate pause_player() / unpause_player functions(), move some pausing-related state into explicit variables and make commands while paused not unpause. Not everything works properly while paused yet (no screen updates etc). command.c | 44 +++++++++++++++++++++----------- mp_core.h | 8 +++++- mplayer.c | 84 +++++++++++++++++++++++++++++++++++++----------------------- 3 files changed, 88 insertions(+), 48 deletions(-) commit 6fa90873ccc8006e479061afdd0edfbfdadf17ec Author: Uoti Urpala Date: Tue Dec 9 04:28:17 2008 +0200 configure: Update required x264 version configure accepted old versions which then caused a build failure later. Update required version number from 59 to 65. configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e948b1ae06afaff3e10df4c03a59133fc0b35105 Author: Uoti Urpala Date: Tue Dec 9 04:14:38 2008 +0200 Work around vo gl/libass subtitle timing problem vo gl generates bitmaps for EOSD content (libass subtitles) when DRAW_EOSD is called but actual drawing of both EOSD and OSD is done in draw_osd(). Since draw_osd() was called first it drew the EOSD content from the previous frame, so the subtitles were always one frame late. As a simple workaround update EOSD content first, then normal OSD. This makes vo gl work correctly and should have no effect on anything else. libmpcodecs/dec_video.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 66cefd5f7196022f5f0c45b2f68a8fa3b354c917 Author: Uoti Urpala Date: Mon Dec 8 22:21:23 2008 +0200 ao_alsa: If pause loses samples replace them with silence If the ALSA pause functionality is not available the driver has to drop buffered samples when MPlayer calls pause(). Replace them by playing a corresponding amount of silence in resume() instead of shortening the overall audio duration. libao2/ao_alsa.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) commit 80986a0aaa9953e4221c7bbf02f5c4cf7b60df94 Author: Uoti Urpala Date: Sat Dec 6 06:24:00 2008 +0200 Update to latest FFmpeg-mt ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit eba4fa2ddf5e78f835bef5b42185bcec67ee5181 Merge: f2dff1f... bc4c570... Author: Uoti Urpala Date: Sat Dec 6 06:23:56 2008 +0200 Merge branch 'master' into mt commit bc4c570ab1fd93db0f24759b35306a3d10985c4b Author: Uoti Urpala Date: Sat Dec 6 06:16:54 2008 +0200 Makefile: prevent default build rules being used on FFmpeg files After adding .o files to the dependencies of FFmpeg .a files make tried to build those .o files with default rules before recursing to the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix incorrectly placed parentheses in the command creating the FFMPEGFILES list. That resulted in some files being listed multiple times, triggering warnings from the dummy rule. Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit a36945fe441294ad2c803dcd592325086a86816f Author: Uoti Urpala Date: Sat Dec 6 05:12:17 2008 +0200 Makefile: Rebuild FFmpeg libraries when .asm and .o files change There was a missing dependency that meant FFmpeg libraries were not recursed if only .asm files changed. Also add a dependency on .o files to update the corresponding .a (though this case should only happen if you run compilation commands manually). Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2a6178e5aba3b53783ee3d36c32d3280d8ce67ac Author: Uoti Urpala Date: Sat Dec 6 04:41:45 2008 +0200 Makefile, common.mak: Create .d files when creating corresponding .o The separate .d file creation logic has caused various problems, most notably cases where 'make' exits without doing anybut but without giving any error either. Change the Makefile so that .d files are always created or updated when the corresponding .o file is. This avoids the problems of current .d file generation and still gives correct dependencies. The common.mak change does the same for the libswscale build. However it does not affect the directories under ffmpeg/ because those use ffmpeg/common.mak. The MPlayer common.mak can be copied over the ffmpeg/common.mak file to make the fix apply to the FFmpeg directories too. This is not done automatically because the FFmpeg file is under version control and changing it could cause problems. Makefile | 19 ++++++++----------- common.mak | 19 +++---------------- 2 files changed, 11 insertions(+), 27 deletions(-) commit b37a869f130a5246d4c98f532d07b73146672c95 Author: Uoti Urpala Date: Sat Dec 6 03:57:08 2008 +0200 Makefile: Don't use "install -d" on existing directories Makefile used "install -d" on directories like "/usr/local/bin". Because the install program always tries to set permissions this command causes an installation failure if the directory exists and is writable but you cannot change its permissions (default configuration for group staff on Debian for example). So avoid running such commands on existing directories. Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit cb3dc68691f4d01426c7abdd9e7bc16f8d461a9f Merge: 8c14417... c6ef662... Author: Uoti Urpala Date: Sat Dec 6 02:16:51 2008 +0200 Merge svn changes up to r28103 commit 8c144171bb80dd3d1f7161b97675e78cad00bc65 Merge: 52ee93c... 8c58890... Author: Uoti Urpala Date: Thu Dec 4 01:55:52 2008 +0200 Merge svn changes up to r28087 Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h commit f2dff1fad8c3f848fd8b5812430164d9d9ebf35f Merge: 9ea58c1... 52ee93c... Author: Uoti Urpala Date: Tue Dec 2 23:09:47 2008 +0200 Merge branch 'master' into mt commit 52ee93c1c64dfaa0afc881c38154b04c100cb617 Author: Uoti Urpala Date: Tue Dec 2 23:09:07 2008 +0200 demux_rtp.cpp: Add missing #include libmpdemux/demux_rtp.cpp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 9ea58c12eec77063249c32570024c80e1d5e205a Merge: 805b1ec... d8fad6c... Author: Uoti Urpala Date: Tue Dec 2 20:56:25 2008 +0200 Merge branch 'master' into mt commit d8fad6cc3d21668ca4efbe87515604d9b9115869 Author: Uoti Urpala Date: Tue Dec 2 20:55:04 2008 +0200 demux_rtp.cpp: Fix compilation issues This file hadn't been updated after some API changes. libmpdemux/demux_rtp.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 14d31933913dcab7cc2a0c62a25d04237de92004 Author: Uoti Urpala Date: Tue Dec 2 20:41:47 2008 +0200 Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compile codec-cfg runs on the host system but EXTRA_INC can have target system paths. The EXTRA_INC was added there for shared libavutil support. Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h (which in turn needed libavutil) instead of including the header, and drop the EXTRA_INC flags. Makefile | 2 +- codec-cfg.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) commit a6af927ea17f5c5a882902653aa95488b87ea512 Author: Uoti Urpala Date: Tue Dec 2 20:09:35 2008 +0200 w32_common.c, vo_direct3d.c: Fix Windows compilation issues In w32_common.c the special "old_vo_defines.h" header was included too late. vo_direct3d.c was copied from svn without fixing the type of the control() function. libvo/vo_direct3d.c | 2 +- libvo/w32_common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 805b1ec55d5cc166d1727bf30ac350bdb1c5f78f Author: Uoti Urpala Date: Tue Dec 2 18:56:20 2008 +0200 Update ffmpeg-mt submodule, should fix -ss ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b65e8bd127fb7eee9debd4ea280846d6ba557467 Merge: 60cd650... 10e4753... Author: Uoti Urpala Date: Tue Dec 2 18:55:53 2008 +0200 Merge branch 'master' into mt commit 10e47539986deab2f0caf1fb8386043a9593796a Author: Uoti Urpala Date: Tue Dec 2 18:40:44 2008 +0200 configure: Define HAVE_BSWAP and HAVE_FAST_64BIT for FFmpeg Set BSWAP unconditionally on x86/AMD64 (it should be available on anything newer than a 386). HAVE_FAST_64BIT could probably be set for more archs than this commit sets it for. configure | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) commit e62517ef6a8d23cd78325a9661f8865bd222e004 Merge: 62dda60... 27b167b... Author: Uoti Urpala Date: Tue Dec 2 18:02:05 2008 +0200 Merge svn changes up to r28065 commit 60cd65049536422e01bd0ae2d4833551fb2ced91 Author: Uoti Urpala Date: Fri Nov 28 17:39:04 2008 +0200 Create a test branch that uses ffmpeg-mt ffmpeg-mt is used as a subproject in this version. .gitignore | 1 - .gitmodules | 3 +++ ffmpeg | 1 + libmpcodecs/vd_ffmpeg.c | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) commit 62dda60800a902fdaf9b0ec63d8488aaa48c485f Merge: 835511a... 189995f... Author: Uoti Urpala Date: Wed Nov 26 20:53:53 2008 +0200 Merge svn changes up to r28043 commit 835511ac394d5283c9c449e6154ccb0db1365321 Merge: 6c71227... cc5e040... Author: Uoti Urpala Date: Tue Nov 25 21:12:01 2008 +0200 Merge svn changes up to r28038 commit 6c712271ce9e8d4eb9cd615e920139ebcb1d1d49 Author: Uoti Urpala Date: Sat Nov 22 19:18:48 2008 +0200 Remove old VO vo_mouse_autohide compatibility #define The VOs no longer access vo_mouse_autohide directly so the #define is not needed. libvo/x11_common.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 6cbca28085f1698bc7c6537631d5efbadf64abf1 Merge: 1715c2a... a83e000... Author: Uoti Urpala Date: Sat Nov 22 19:16:43 2008 +0200 Merge svn changes up to r27979 commit 1715c2a33632b333f8e8e581ef23ea5fe0234edd Merge: e46ce9c... 409bb1c... Author: Uoti Urpala Date: Mon Nov 17 20:50:23 2008 +0200 Merge svn changes up to r27949 Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c commit e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 Merge: e51225d... 14eb21f... Author: Uoti Urpala Date: Thu Nov 6 20:41:40 2008 +0200 Merge svn changes up to r27899 commit e51225dc3135e69d3f0fe6a5502c0c0e77952056 Author: Uoti Urpala Date: Sun Nov 2 11:19:43 2008 +0200 configure: Fix FAST_CMOV detection on AMD64 The code that enabled FAST_CMOV by default was only executed in the 32-bit case. As a result FAST_CMOV was never automatically enabled on AMD64. Fix this by moving the code out of the arch-specific section so it's executed on both x86 and AMD64; it's harmless on architectures that do not support CMOV. configure | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit 2ad77c5b00ce5d03c5db7633ef12dbe71a297e05 Merge: 479f5e7... af97f64... Author: Uoti Urpala Date: Thu Oct 30 08:25:33 2008 +0200 Merge svn changes up to r27850 commit 479f5e742f22d46430fa265adfa9162f4e2ab865 Merge: 0d7f9f0... 9729396... Author: Uoti Urpala Date: Tue Oct 28 04:12:18 2008 +0200 Merge svn changes up to r27841 Conflicts: mplayer.c commit 0d7f9f033cdd677df3b85aca45491955b87a1abc Merge: 4db39fd... 8bfdce3... Author: Uoti Urpala Date: Sun Oct 26 04:24:47 2008 +0200 Merge svn changes up to r27828 commit 4db39fdfdb9caeb91ed7fbd87174faa49f8baeda Author: Uoti Urpala Date: Sat Oct 25 05:18:08 2008 +0300 vd.c: Remove pointless SCREEN_SIZE_[XY] #defines The #defines look like they're pointless leftovers from removed code so remove them too. libmpcodecs/vd.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) commit 030130942562bb7b84eeba53e0226abed5a63a4c Merge: 562d86d... 15a8009... Author: Uoti Urpala Date: Sat Oct 25 05:12:34 2008 +0300 Merge svn changes up to 27824 Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c commit 562d86d95cbba67cb58358f6fc334553a467dee7 Author: Uoti Urpala Date: Sat Oct 4 07:52:27 2008 +0300 demux: Increase max buffered packet bytes from 8 to 128 MiB The hard limit on the amount of buffered bytes per demuxer stream had not been increased since 2001. Since then there have been significant increases in both video bitrates (so it's easier to hit the limit) and typical memory available on a computer (so there's less reason to limit the memory used for buffering). The 8 MiB limit was too easy to hit in the case of high-bitrate video lagging behind audio, when the file is demuxed ahead to get audio packets but video has to be buffered until the decoder catches up to that point. Increase the limit to 128 MiB and remove the #ifdef for CONFIG_TV_BSDBT848 because the normal limit is now higher than the increased value under the #ifdef. libmpdemux/demuxer.h | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit 0a674354b714248722d070c9a6dbafbde1a19557 Author: Uoti Urpala Date: Sat Oct 4 07:21:21 2008 +0300 demux: Reset demux stream 'eof' flag after packet buffer overflow The eof flag is set when another demuxer stream has hit the limit on the size or count of buffered packets. This makes sense because in that error situation the calling code can not rely on being able to demux more packets from this stream, so it should rather exit or whatever instead of getting stuck trying. However the situation can improve if packets are demuxed from the other stream. In that case the eof flag should be cleared. This commit adds code to clear the flag if something is successfully read from the stream (so it's only cleared if a caller tries to read packets despite the flag being set; that's enough to fix audio sync issues after video packet buffer overflow). libmpdemux/demuxer.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit e7a611de0058bb48bfe75dd86f28c9ea3f3288c5 Merge: ebb4abf... bf0e018... Author: Uoti Urpala Date: Fri Oct 3 18:05:21 2008 +0300 Merge svn changes up to r27688 commit ebb4abf2081026c63bb5c983f76447d9d2413656 Merge: 849dc0b... 20571d6... Author: Uoti Urpala Date: Thu Oct 2 05:17:23 2008 +0300 Merge svn changes up to r27682 Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c commit 20571d6f6870dab84624cc6b6fbac82cde204f16 Author: Uoti Urpala Date: Thu Oct 2 05:01:36 2008 +0300 Revert "add outdir sub-option to vo png" This reverts commit 22322409ddb527ac855ba71d10dadcb9da415f81. The reverted commit had at least the following problems: - It adds a lot of filesystem handling code to an individual VO. - The added code is duplicated from vo_jpeg.c. - The added code has exit_player() calls. A VO should not exit the whole program. Even if vo_jpeg still has those calls they are a bug that shouldn't spread elsewhere. - The functionality benefit of automatic directory creation is questionable. It was probably only included in vo_jpeg because of the option to automatically create multiple subdirectories (though the utility of that is also questionable); vo_png does not have that. DOCS/man/en/mplayer.1 | 2 - DOCS/man/fr/mplayer.1 | 2 - libvo/vo_png.c | 66 +----------------------------------------------- 3 files changed, 2 insertions(+), 68 deletions(-) commit 849dc0ba31f209dfdb48146512e48ee2203d0ee6 Merge: 259ea9d... 7756839... Author: Uoti Urpala Date: Sat Sep 20 16:13:33 2008 +0300 Merge svn changes up to r27649 Conflicts: Makefile configure libvo/x11_common.c commit 259ea9d7034566760785fd5253f97b65ee8cd6ed Merge: b568583... 60a3099... Author: Uoti Urpala Date: Wed Sep 10 23:59:08 2008 +0300 Merge svn changes up to r27573 Conflicts: libmpcodecs/vd_ffmpeg.c commit b56858342fdbe48489618107df75e5bd0451eb0b Merge: 8ea7eb7... bae9477... Author: Uoti Urpala Date: Wed Sep 3 10:16:30 2008 +0300 Merge svn changes up to r27514 commit 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f Author: Uoti Urpala Date: Wed Aug 13 08:06:26 2008 +0300 core: Clean up move-to-next-file logic The mpctx->eof field was used to also store other reasons to stop playing the current file besides EOF, and the code didn't properly distinguish those from EOF. Rename the field to "stop_play" and clean up some of the code accessing it. Properly separating EOF from other reasons allows handling file switching better. Before this commit buffered audio was always drained before moving to the next file (the only exception when it was NOT drained when stopping a file was when quitting the player completely). This added an extra delay when manually moving to the next file as you had to wait for the currently buffered audio to finish playing before the next file would start. After this commit audio is only drained if the file reaches EOF normally; otherwise audio is cut and the next file starts immediately. command.c | 34 +++++++++++++---------- mp_core.h | 20 ++++++++----- mplayer.c | 86 +++++++++++++++++++++++++++++++----------------------------- 3 files changed, 75 insertions(+), 65 deletions(-) commit e107cf785132418cc658e1cee4ad814e17eac886 Author: Uoti Urpala Date: Wed Aug 13 05:54:56 2008 +0300 Use correct terminal "clear line" code The "erase_to_end_of_line" string used to clear the terminal status line was initialized with the termcap id "cd", which means to clear all lines below the cursor. Change it to the correct "ce" to clear the current line. Usually the status line is on the bottommost line of the terminal so the behaviour wouldn't differ much. However it did make a difference when I tested starting MPlayer at the top of a huge gnome-terminal window so the status line was not at the bottom; in that case clearing just the current line used less CPU than clearing the part of the huge window below the status line. osdep/getch2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e09fe1ce0413609b891f4abf2f5df5f1996622a0 Merge: 9425571... f88bf0c... Author: Uoti Urpala Date: Tue Aug 12 15:03:34 2008 +0300 Merge svn changes up to r27458 commit 9425571f41d5cca40ec75537cdac3e474948f047 Author: Uoti Urpala Date: Tue Aug 12 14:54:51 2008 +0300 mplayer.c: #include mplayer.h and access_mpcontext.h Both declare symbols defined in mplayer.c, so include them to make the compiler check the declarations match. mplayer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 8685eea8c2047036f147ca3b6ef1eb0b2354bebb Author: Uoti Urpala Date: Tue Aug 12 14:50:54 2008 +0300 Rename exit_player() use outside core to exit_player_bad() The VOs which use it shouldn't really exit the whole program. The renaming will allow including mplayer.h in mplayer.c without clashing with the static exit_player() there. libvo/vo_jpeg.c | 12 ++++++------ libvo/vo_md5sum.c | 6 +++--- libvo/vo_pnm.c | 16 ++++++++-------- mplayer.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) commit 9f7c6291a525b62628360166f8313db6904fb44e Author: Uoti Urpala Date: Tue Aug 12 14:30:43 2008 +0300 Remove special error message for -ao alsa1x and alsa9 Those variants were removed in 2004. Remove the special handling of those ao names and treat them like any other unrecognized ao name. This removes a questionable exit_player() call. help/help_mp-en.h | 1 - libao2/audio_out.c | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) commit 1ade57af4bd671ed58ab6de897ff3f07b4363e76 Author: Uoti Urpala Date: Tue Aug 12 14:27:14 2008 +0300 m_config.c: Remove unused function m_config_get_option_ptr m_config.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) commit 0f2daad81dfb63605b38efd49e185d450743b7e3 Author: Uoti Urpala Date: Tue Aug 12 14:26:40 2008 +0300 spuenc.c: Remove unused code libvo/spuenc.c | 47 ----------------------------------------------- libvo/spuenc.h | 1 - 2 files changed, 0 insertions(+), 48 deletions(-) commit cfe2839386f737a05d3af41051f9b367c2c7bd7d Author: Uoti Urpala Date: Tue Aug 12 14:22:26 2008 +0300 Move some declarations from mplayer.c to proper headers Declare mp_input_register_options in input.h and xscreensaver_heartbeat in x11_common.h. input/input.h | 3 +++ libvo/x11_common.h | 2 ++ mplayer.c | 8 -------- 3 files changed, 5 insertions(+), 8 deletions(-) commit 8d5912e60d3e2a12f9dae475af4472c2bc6490a6 Author: Uoti Urpala Date: Tue Aug 12 14:17:00 2008 +0300 mpeg ao/vo drivers: Fix packet-writing helper function types Add missing 'const' to callback functions passed to send_mpeg_pes_packet() / send_mpeg_lpcm_packet(). libao2/ao_ivtv.c | 2 +- libao2/ao_mpegpes.c | 2 +- libao2/ao_v4l2.c | 2 +- libvo/vo_ivtv.c | 2 +- libvo/vo_mpegpes.c | 2 +- libvo/vo_v4l2.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) commit 680703ecae05a00f68573f5d434d6056fa78a437 Author: Uoti Urpala Date: Tue Aug 12 14:04:08 2008 +0300 ao_mpegpes: Remove declarations of unused functions libao2/ao_mpegpes.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit f6dfaf26f8b513deb8635f75a4115fa04a3c7f4f Author: Uoti Urpala Date: Tue Aug 12 13:58:29 2008 +0300 Make various functions static libao2/ao_sdl.c | 2 +- libass/ass_render.c | 6 +++--- libmenu/menu.c | 4 ++-- libmpcodecs/ad_liba52.c | 4 ++-- libmpcodecs/native/rtjpegn.c | 34 +++++++++++++++------------------- libmpcodecs/native/xa_gsm.c | 2 +- libmpcodecs/vd_ffmpeg.c | 4 ++-- libmpcodecs/vd_ijpg.c | 2 +- libmpcodecs/vf_2xsai.c | 4 ++-- libmpcodecs/vf_remove_logo.c | 2 +- libmpcodecs/vf_screenshot.c | 2 +- libmpdemux/demux_avi.c | 8 ++++---- libmpdemux/demux_avs.c | 2 +- libmpdemux/demux_mov.c | 2 +- libmpdemux/demux_mpg.c | 6 +++--- libmpdemux/demux_ogg.c | 4 ++-- libmpdemux/demux_pva.c | 2 +- libmpdemux/demuxer.c | 2 +- libmpdemux/mp3_hdr.c | 2 +- libvo/vo_aa.c | 2 +- libvo/vo_mpegpes.c | 7 +------ mplayer.c | 2 +- playtree.c | 4 ++-- spudec.c | 5 +++-- stream/stream_dvd.c | 6 +++--- stream/tv.c | 2 +- subreader.c | 2 +- vidix/nvidia_vid.c | 4 ++-- 28 files changed, 60 insertions(+), 68 deletions(-) commit cab2e4f5caf454dd5f96eddfaba9c89c5aad51fc Author: Uoti Urpala Date: Tue Aug 12 13:46:01 2008 +0300 Include corresponding .h in some .c files av_opts.c | 1 + libmpdemux/mp3_hdr.c | 1 + mpcommon.c | 1 + osdep/timer-linux.c | 1 + stream/cache2.c | 1 + vidix/drivers.c | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) commit 0d091760781466c3cb6a3426daecadf8a696fa88 Author: Uoti Urpala Date: Tue Aug 12 12:49:37 2008 +0300 stream.h: Add 2 prototypes instead of declaring them in cache2.c Declare stream_fill_buffer() and stream_seek_long() always (before they were only declared if cache was disabled and those were used instead of cached versions). Remove the now redundant declarations in cache2.c. stream/cache2.c | 3 --- stream/stream.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) commit 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 Merge: 2ba9df3... af76be6... Author: Uoti Urpala Date: Fri Aug 8 02:04:43 2008 +0300 Merge svn changes up to r27441 Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h commit 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 Author: Uoti Urpala Date: Sun Aug 3 21:14:11 2008 +0300 ad_pcm: Track pts explicitly ad_pcm used the old audio timestamp tracking system that calculated timestamp at end of decoder output as last_timestamp_in_input_decoder_has_read + bytes_read_after_that_timestamp / input_bitrate. For PCM this can be accurate as input bitrate is constant. However it relies on input bitrate being known and actually set. At least in some case with .mov input and libavformat demuxer it wasn't set. Instead of special-casing PCM to make sure input bitrate is set (in general it may not be known or constant at all) change ad_pcm to explicitly set the pts information on the decoder output side. libmpcodecs/ad_pcm.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) commit 6cce822505c0a76ac520909a895021b8f5b7e5ab Merge: 04f3909... ded7033... Author: Uoti Urpala Date: Sat Aug 2 22:04:35 2008 +0300 Merge svn changes up to r27399 Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c commit 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 Merge: 3a69d65... 1fdf02e... Author: Uoti Urpala Date: Wed Jul 30 16:39:24 2008 +0300 Merge svn changes up to r27374 Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c commit 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d Merge: 577587e... 901574e... Author: Uoti Urpala Date: Fri Jul 25 02:14:16 2008 +0300 Merge svn changes up to r27347 Conflicts: libvo/x11_common.c libvo/x11_common.h Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts with the global variable "vo_border"; done in the merge commit because uses of the macro needed changes anyway to resolve conflicts. commit 577587ec6ce8dad59c303a76cba03af03db879a3 Author: Uoti Urpala Date: Wed Jul 23 06:06:22 2008 +0300 vf_ass: Copy less unnecessary data to/from work area The filter copied the chroma planes from every potentially changed row of the original image to its non-subsampled work area. Change it to calculate the minimum and maximum x coordinate for each chroma row and only copy the part between those. The performance increase is only minor (though observable), but I think the resulting code is no more complex than the original. libmpcodecs/vf_ass.c | 98 +++++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 48 deletions(-) commit 4dab4347f5d7bb3642a2c5918fc29855f8f62482 Author: Uoti Urpala Date: Wed Jul 23 01:47:30 2008 +0300 vf_ass: Optimize alpha multiply The effect of alpha blending was calculated as color = orig_color * alpha / 255 where alpha and color range from 0 to 255. Change this to color = (orig_color * alpha + 255) / 256 where the "/ 256" can be expressed as a shift whereas the compiler would probably generate a multiply+shift for the original "/ 255". This formula gives a result that is too high by 1 for some inputs. However it gives the exact result if alpha is 0 or 255 which is probably the case where small errors would matter most. libmpcodecs/vf_ass.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 2d4656e070697cebe8cb66568b3e8dd8919b5eed Merge: 92f0cba... 4993d0c... Author: Uoti Urpala Date: Mon Jul 21 15:03:49 2008 +0300 Merge svn changes up to r27332 commit 92f0cba26b5c032f8b097f525862233d92a02a2d Merge: 06c533b... cf8d381... Author: Uoti Urpala Date: Tue Jul 15 02:59:27 2008 +0300 Merge svn changes up to r27281 commit 06c533b167c37540b578fb1c70d2acb44ce59245 Author: Uoti Urpala Date: Wed Jul 9 20:02:34 2008 +0300 Fix crash during early exit Starting MPlayer with options such as "-demuxer help" that exit before initializing OSD struct would crash at exit because of a reference to mpctx->osd->sub_font in deinitialization code. Fix by checking that mpctx->osd is not NULL. Checking that osd->sub_font is not NULL was unnecessary because free_font_desc(NULL) is safe. mplayer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit ca3feba5c339f12141bf335e5592967caccc290b Merge: 8ea134b... 8760b0c... Author: Uoti Urpala Date: Wed Jul 9 18:32:51 2008 +0300 Merge svn changes up to r27242 Conflicts: Makefile configure commit 8ea134bd23022afbe1a06c0241c0c2c6ea2618f8 Merge: 7de350c... 6d14167... Author: Uoti Urpala Date: Sat Jul 5 02:55:56 2008 +0300 Merge svn changes up to r27202 commit 7de350c673e1c0ae52d655e322a072f2f6b624b0 Merge: 28fbfd2... 3ff9a6e... Author: Uoti Urpala Date: Tue Jul 1 16:18:21 2008 +0300 Merge svn changes up to r27184 commit 28fbfd2cdea5ffa860a251de274a74b0e85c88f0 Author: Uoti Urpala Date: Thu Jun 26 22:52:04 2008 +0300 configure: fix --with-dvdread-config Remove erroneous line that always changed the user-selected value back to the default 'dvdread-config'. configure | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 0f73474fca60c3b06afab7906d0671ac3bef42b4 Author: Uoti Urpala Date: Thu Jun 26 06:42:03 2008 +0300 Fix compilation with dvdnav enabled Some dvdnav-specific code had not been properly updated after moving options to option struct and removing global mpctx. mplayer.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) commit 0e85dc0f3272a3b8eec7cb4c8010c233c725ce73 Author: Uoti Urpala Date: Tue Jun 24 08:29:36 2008 +0300 Move global sub_font to OSD struct libvo/font_load.h | 1 - libvo/sub.c | 20 ++++++++++---------- libvo/sub.h | 1 + mplayer.c | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) commit dd8938650041e22f77e6526281d0dae4727c4160 Author: Uoti Urpala Date: Tue Jun 24 02:03:19 2008 +0300 Remove unnecessary casts of sh_video->vfilter The casts were left from the time when the type of sh_video->vfilter was (unnecessarily) void *. Now that the field has the correct type the casts are pointless. mencoder.c | 10 +++++----- mplayer.c | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) commit a232f564d3f271277135276281c03cca7807ef16 Author: Uoti Urpala Date: Tue Jun 24 01:53:58 2008 +0300 Create a context struct for OSD state This commit creates the struct and passes it to some functions that needs to access OSD state but does not yet move much data from globals to it. vf_expand accesses the OSD state for rendering purposes outside of the normal OSD draw time. The way this currently works is suboptimal, but I did not attempt to clean it up now. To keep things working the same way vf_expand needs to know the address of the state object to be able to access the data even in the functions that should normally not need it. For that purpose this commit adds a VFCTRL to tell vf_expand the address of the object. libmpcodecs/dec_video.c | 5 +++-- libmpcodecs/dec_video.h | 5 ++++- libmpcodecs/vf.h | 3 +++ libmpcodecs/vf_expand.c | 24 ++++++++++++++---------- libmpcodecs/vf_vo.c | 2 +- libvo/old_vo_wrapper.c | 10 ++++++++-- libvo/old_vo_wrapper.h | 4 +++- libvo/sub.c | 43 +++++++++++++++++++++++++++++-------------- libvo/sub.h | 27 +++++++++++++++++++-------- libvo/video_out.c | 4 ++-- libvo/video_out.h | 5 +++-- libvo/vo_aa.c | 17 +++++++---------- libvo/vo_xv.c | 4 ++-- mencoder.c | 12 ++++++++---- mp_core.h | 1 + mplayer.c | 31 ++++++++++++++++--------------- 16 files changed, 123 insertions(+), 74 deletions(-) commit de560e8167c21a8fd9ea34f5f42f377102d65232 Merge: 68e70b3... 5eee463... Author: Uoti Urpala Date: Mon Jun 23 03:58:44 2008 +0300 Merge svn changes up to r27123 Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c commit 68e70b3ec34af2e1002d17d0dc81b3408a399ade Merge: af3fcdf... dcd0902... Author: Uoti Urpala Date: Tue Jun 17 02:18:10 2008 +0300 Merge svn changes up to r27092 Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c commit af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 Merge: d5c8683... 4653f5e... Author: Uoti Urpala Date: Sat Jun 7 19:57:57 2008 +0300 Merge svn changes up to r27025 Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c commit d5c868325cefcd5fad53361d1dfdc9757674eb70 Merge: 0cb5123... 5b3834c... Author: Uoti Urpala Date: Wed Jun 4 08:10:48 2008 +0300 Merge svn changes up to r26979 Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c commit 0cb5123c8f65b3d7715deb22ce8430eccc21996e Author: Uoti Urpala Date: Thu May 15 21:25:17 2008 +0300 vo_xv: Fix port selection Port selection was broken in conversion to new VO API (the user setting was parsed to a variable that then wasn't used for anything). Fix by parsing it to the x11 struct xv_port variable. libvo/vo_xv.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit a41db36b22053c2cf103899f3510f68ff5645662 Merge: 267a3f4... 84fa3d6... Author: Uoti Urpala Date: Thu May 15 21:19:35 2008 +0300 Merge svn changes up to r26783 Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c commit 267a3f4c9c00848f32c341595d2d831157a79bee Merge: 5484215... 96fa9c4... Author: Uoti Urpala Date: Wed May 7 13:07:48 2008 +0300 Merge svn changes up to r26680 Conflicts: Makefile configure osdep/timer-darwin.c commit 5484215d044522bcd30516e458e421f403ca8e35 Author: Uoti Urpala Date: Thu May 1 20:03:11 2008 +0300 sub.h: Remove obsolete code under #if 0 According to the comment this was once a way to disable subtitles, but changing the #if 0 to #if 1 couldn't have compiled for years. libvo/sub.h | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) commit 1d1ddcb5931150c9cce405f1e39157195749bc00 Author: Uoti Urpala Date: Thu May 1 11:14:29 2008 +0300 Move aspect.c options to option struct cfg-mplayer.h | 11 +++-------- defaultopts.c | 2 ++ libvo/aspect.c | 22 ++++++++++------------ options.h | 3 +++ 4 files changed, 18 insertions(+), 20 deletions(-) commit c172b5355f2a0fa008fd5187ce323fb9676871b3 Author: Uoti Urpala Date: Thu May 1 11:02:26 2008 +0300 libvo: Move aspect.c static variables to vo struct This moves non-option variables. aspect.c still defines option globals. libvo/aspect.c | 102 ++++++++++++++++++++++++---------------------------- libvo/aspect.h | 34 ++++++++++++------ libvo/video_out.c | 8 ++-- libvo/video_out.h | 14 +++++++ libvo/vo_dxr2.c | 2 +- libvo/vo_dxr3.c | 1 - libvo/vo_macosx.m | 1 - libvo/vo_quartz.c | 1 - libvo/vo_xv.c | 71 +++++++++++++++++++----------------- libvo/w32_common.c | 2 +- libvo/x11_common.c | 2 +- 11 files changed, 128 insertions(+), 110 deletions(-) commit 91b3d6a95568eec8a927e488c103e5ba1136e021 Author: Uoti Urpala Date: Thu May 1 09:12:38 2008 +0300 sub.c: Make tables const libvo/sub.c | 4 ++-- libvo/sub.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit bec3b84f5ef798ab843028dd62018571a50330ed Merge: 9d27862... 19c9e0a... Author: Uoti Urpala Date: Thu May 1 08:18:50 2008 +0300 Merge svn changes up to r26624 Conflicts: Makefile commit 9d27862072a233b423d4a81e966b1ba9627724a6 Author: Uoti Urpala Date: Thu May 1 08:10:49 2008 +0300 input.c: Use talloc for all memory allocations Convert the remaining non-talloc memory allocations so that everything in the file consistently uses talloc. Make one additional minor code simplification in read_cmd. input/input.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) commit 8de8be15366b235fb252d5f83509b0ce1ea825c5 Author: Uoti Urpala Date: Wed Apr 30 18:57:02 2008 +0300 Move input options to option struct defaultopts.c | 9 ++++++ input/input.c | 77 ++++++++++++++++++++++++++++----------------------------- input/input.h | 3 +- m_option.h | 1 + mplayer.c | 2 +- options.h | 11 ++++++++ 6 files changed, 62 insertions(+), 41 deletions(-) commit bb12a33f9ae0b5cbf628e6f4e0218736a89e481f Author: Uoti Urpala Date: Wed Apr 30 19:34:26 2008 +0300 options: Make dynamic dup hack work with new options The option system has a hack that converts default values (potentially constants) of dynamically allocated options to allocated ones when the options are first added to the config system, so that all values can be equally freed later. Make this work with new-style options in the option struct too. m_config.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) commit e61ac5e9cb870c03e2404f5dd19cb0bb25aab80c Author: Uoti Urpala Date: Wed Apr 30 19:20:01 2008 +0300 m_config.c: Cosmetics: fix nested block lacking indentation m_config.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) commit d2f4db51fb6cac300613c6f9c9c1260a2e63fba1 Author: Uoti Urpala Date: Wed Apr 30 13:47:21 2008 +0300 input: Use talloc for struct mp_cmd and things under it input/input.c | 40 ++++++++++++---------------------------- 1 files changed, 12 insertions(+), 28 deletions(-) commit a5fdd8f6f94710d2dc14d18f12c1b79975b40bdf Author: Uoti Urpala Date: Wed Apr 30 13:14:03 2008 +0300 input: Move command filedescriptor list to context struct input/input.c | 56 +++++++++++++++++++++++++++++++------------------------- input/input.h | 7 +++---- mplayer.c | 2 +- 3 files changed, 35 insertions(+), 30 deletions(-) commit 423b95bf5cc46da5952a907fa565c0c7119724f0 Author: Uoti Urpala Date: Wed Apr 30 13:00:59 2008 +0300 input: Move cmd_queue to context struct Menu instances now also need a input context pointer to queue commands. command.c | 6 ++++-- input/input.c | 40 +++++++++++++++++++++------------------- input/input.h | 5 ++--- libmenu/menu.c | 8 ++++++-- libmenu/menu.h | 4 +++- libmenu/menu_chapsel.c | 4 ++-- libmenu/menu_cmdlist.c | 8 ++++---- libmenu/menu_console.c | 2 +- libmenu/menu_dvbin.c | 4 ++-- libmenu/menu_filesel.c | 4 ++-- libmenu/menu_param.c | 2 +- libmenu/menu_pt.c | 2 +- libvo/vo_macosx.m | 2 +- libvo/w32_common.c | 2 +- libvo/x11_common.c | 3 ++- mplayer.c | 7 ++++--- 16 files changed, 57 insertions(+), 46 deletions(-) commit f7b608812ea637f89d9f9e860982940fd7101495 Author: Uoti Urpala Date: Wed Apr 30 12:29:16 2008 +0300 input.c: Change a static variable to local input/input.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) commit bfcb3a7a8130be478103beb1923567f5e5d86c67 Author: Uoti Urpala Date: Wed Apr 30 11:06:55 2008 +0300 input: Move key filedescriptor list to context struct The context variable is now passed to VOs too as it's now needed to add a callback on the X filedescriptor. input/input.c | 54 +++++++++++++++++++++++++++++----------------------- input/input.h | 8 +++--- libvo/video_out.c | 14 +++++++++--- libvo/video_out.h | 4 ++- libvo/vo_xv.c | 6 ++-- mplayer.c | 6 ++-- 6 files changed, 53 insertions(+), 39 deletions(-) commit 32e52b8fd0b917a40a9192770cc1a41aa31b34d0 Author: Uoti Urpala Date: Wed Apr 30 10:27:04 2008 +0300 input.c: Move variable from static to local input/input.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit a2b320fb042e637eea594d097a0fee179585e838 Author: Uoti Urpala Date: Wed Apr 30 10:21:50 2008 +0300 input.c: Move key down state to context struct input/input.c | 69 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 33 deletions(-) commit f7879d206eb678d6b01042546a5f594bd10dc53e Author: Uoti Urpala Date: Wed Apr 30 10:06:45 2008 +0300 input.c: Use talloc for command bind allocations input/input.c | 42 +++++++++++------------------------------- 1 files changed, 11 insertions(+), 31 deletions(-) commit d0e82926297e9f857d20cc25e4fe175526fe5c30 Author: Uoti Urpala Date: Wed Apr 30 09:53:12 2008 +0300 input.[ch]: Move some type definitions from .h to .c These aren't used outside input.c. input/input.c | 10 ++++++++++ input/input.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) commit a4240ff36191c82653b3ebe43caa3bd43db44a42 Author: Uoti Urpala Date: Wed Apr 30 09:30:51 2008 +0300 input.c: Remove mp_input_ prefixes from static function names The prefixes make the code unnecessarily verbose for no real benefit. input/input.c | 118 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 58 insertions(+), 60 deletions(-) commit f328386c33d16d7adf3d5618de1f3e568f111c32 Author: Uoti Urpala Date: Wed Apr 30 09:19:16 2008 +0300 input.c: Make two functions static input/input.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 66db9ec7d6a9f869dc922ad9a9b8a5d278577bab Author: Uoti Urpala Date: Wed Apr 30 09:14:06 2008 +0300 Remove INITIALIZED_INPUT from mpctx->initialized_flags The input functions are never uninited except at exit. Move the uninit to player exit function and remove the flag. input/input.c | 3 +++ mp_core.h | 1 - mplayer.c | 22 +++++++++------------- 3 files changed, 12 insertions(+), 14 deletions(-) commit 7b085d4514d091945492cb00fa5a98bbd1bc7cf8 Author: Uoti Urpala Date: Wed Apr 30 08:56:45 2008 +0300 input: Move command bind variables to context struct command.c | 4 +- input/input.c | 121 +++++++++++++++++++++++++++++++------------------------- input/input.h | 6 +-- mplayer.c | 4 +- 4 files changed, 73 insertions(+), 62 deletions(-) commit 9e9932d4d79fee2cd03ea8b88ee7281a7858837f Author: Uoti Urpala Date: Wed Apr 30 07:15:52 2008 +0300 Create a context for input.c state Start moving static variables to a context struct. Only autorepeat state is moved to the struct in this commit. mp_input_check_interrupt now requires the context variable. Change stream functions to pass it. It's still stored in a static variable in stream/. input/input.c | 91 +++++++++++++++++++++++++++++++----------------------- input/input.h | 12 ++++---- mp_core.h | 1 + mplayer.c | 20 ++++++------ stream/stream.c | 11 +++++-- stream/stream.h | 4 ++- 6 files changed, 80 insertions(+), 59 deletions(-) commit 56fec4dfdca623c36d29ed7cb30e7637d99fb942 Author: Uoti Urpala Date: Wed Apr 30 07:01:33 2008 +0300 mencoder.c: Remove unused function mp_check_interrupt_callback should have been removed when stream_set_interrupt_callback was added as stream no longer requires the symbol. mencoder.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) commit bde509648f8acd8bcae32b9932b459d710b11b51 Author: Uoti Urpala Date: Wed Apr 30 06:30:34 2008 +0300 input.c: Remove _st prefix from struct names input/input.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 431bf1f5b647ba61103c6a2573fb9472f0aa6122 Merge: 4237cb8... 2e30b5c... Author: Uoti Urpala Date: Wed Apr 30 05:56:50 2008 +0300 Merge svn changes up to r26599 commit 4237cb821b9eb5b28f1d14963563077e55225396 Author: Uoti Urpala Date: Tue Apr 29 16:22:33 2008 +0300 Move allocation/free of x11 struct to x11_common.c Allocate the struct in the init function and free in uninit. libvo/x11_common.c | 6 +++++- libvo/x11_common.h | 2 +- mplayer.c | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) commit d3113662b040cab1ba8cb44dc90db206f5ec34ca Author: Uoti Urpala Date: Tue Apr 29 15:47:44 2008 +0300 Mark option -key-fifo-size global The fifo is only allocated once and not resized later. After the previous commit trying to change it for later files would have no effect. With older code it could cause memory corruption if you set the option to a value larger than the already allocated size. cfg-mplayer.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 06405a5ba56a0c38b76859a8e1e4665061028a79 Author: Uoti Urpala Date: Tue Apr 29 15:44:03 2008 +0300 Move key_fifo_size & doubleclick_time to options struct cfg-mplayer.h | 7 ++----- defaultopts.c | 2 ++ mp_fifo.c | 12 ++++++------ mp_fifo.h | 4 +++- mplayer.c | 2 +- options.h | 2 ++ 6 files changed, 16 insertions(+), 13 deletions(-) commit 77ec83e351ca7218464f8f77a711520d68fa2e5d Author: Uoti Urpala Date: Tue Apr 29 15:12:19 2008 +0300 Add a context for mp_fifo Store data in an allocated context and take it as an argument instead of using static variables. command.c | 2 +- libvo/video_out.c | 8 ++- libvo/video_out.h | 4 +- libvo/vo_xv.c | 5 +- libvo/x11_common.c | 180 ++++++++++++++++++++++++++------------------------- libvo/x11_common.h | 2 +- mencoder.c | 3 +- mp_core.h | 1 + mp_fifo.c | 111 ++++++++++++++++++-------------- mp_fifo.h | 9 ++- mplayer.c | 12 ++-- osdep/getch2-os2.c | 4 +- osdep/getch2-win.c | 4 +- osdep/getch2.c | 4 +- osdep/getch2.h | 3 +- 15 files changed, 192 insertions(+), 160 deletions(-) commit f59cda84b1e52293e656fffea1529896d28b2d21 Author: Uoti Urpala Date: Tue Apr 29 14:52:45 2008 +0300 mp_fifo.c, osdep/: Include corresponding .h in .c files mp_fifo.c | 1 + osdep/getch2-os2.c | 1 + osdep/getch2-win.c | 2 ++ osdep/getch2.c | 1 + osdep/mmap_anon.c | 2 ++ osdep/shmem.c | 2 ++ 6 files changed, 9 insertions(+), 0 deletions(-) commit 13110e92ba809e2c8a247f827bb42fe6ec1a2ce9 Author: Uoti Urpala Date: Tue Apr 29 14:11:59 2008 +0300 vo_macosx: Include header instead of "extern ..." libvo/vo_macosx.m | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 84f0949416c649f9f19fb3f44b5b277c8dbdd8d2 Author: Uoti Urpala Date: Tue Apr 29 13:29:28 2008 +0300 vo_macosx.m: Fix compilation after recent changes This .m file had not been updated during other VO changes. libvo/vo_macosx.m | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 3e389c5284c6fe719558cf45f5b011e61528058b Author: Uoti Urpala Date: Tue Apr 29 12:58:29 2008 +0300 input.c: Use union instead of void * input/input.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) commit 986e519fc9373e2b3dab6f86debcbd7e13466c34 Author: Uoti Urpala Date: Tue Apr 29 12:55:23 2008 +0300 input: Remove separate mp_input_add_event_fd Use the same mp_input_add_key_fd for all uses and add a context argument to its callback that was before only in the event fd callbacks. Instead of checking in input.c whether keys were inserted to the keypress FIFO during the callback do the check in the callback before returning and set return value accordingly. input/ar.c | 4 ++-- input/ar.h | 2 +- input/input.c | 51 ++++++++------------------------------------------- input/input.h | 8 ++------ input/joystick.c | 2 +- input/joystick.h | 2 +- libvo/vo_xv.c | 11 +++++++---- mp_fifo.c | 3 ++- mp_fifo.h | 2 +- mplayer.c | 7 ++++--- 10 files changed, 29 insertions(+), 63 deletions(-) commit b6b82964aa3f9ba93f6f284ed97c278743f50fce Author: Uoti Urpala Date: Tue Apr 29 12:24:02 2008 +0300 input.c: Revert code uglifications done for gcc 2.95 It's unlikely that this branch will ever compile with gcc 2.95 again, so it's pointless to keep code uglifications done to work around its limitations. input/input.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) commit 5a08b7f96dfb5a38385f860d79fd004602c85676 Author: Uoti Urpala Date: Tue Apr 29 12:13:20 2008 +0300 input.c: Remove unnecessary #include "osdep/getch2.h" input/input.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit c57224ddec8a30bac7379fd13e2d45beb43050d8 Author: Uoti Urpala Date: Tue Apr 29 05:39:13 2008 +0300 Makefile: Fix RECURSIVE_RULE with nested subdirectories The rule produces dependencies for .a files in subdirectories. After moving FFmpeg subdirectories under ffmpeg/ "$(part)/$(part).a:" gave results like "ffmpeg/libavutil/ffmpeg/libavutil.a:". Fix it to produce "ffmpeg/libavutil/libavutil.a". Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 06a35804f37754e2d6ec5bdebe9d83fcddb1caf6 Merge: e1ef11f... 7398abf... Author: Uoti Urpala Date: Tue Apr 29 04:34:58 2008 +0300 Merge svn changes up to r26587 Conflicts: Makefile configure osdep/timer-darwin.c commit e1ef11f0f62cac4a848a4cc9bba2f06dee8fd362 Author: Uoti Urpala Date: Mon Apr 28 16:38:40 2008 +0300 font_load_ft.c: Make tables const libvo/font_load_ft.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit f800a42e45fe47fa9c5ad51094adebb5ea662a0d Author: Uoti Urpala Date: Mon Apr 28 12:12:56 2008 +0300 osdep: Remove cruft Delete some commented out or otherwise unused lines. osdep/timer-linux.c | 15 --------------- osdep/timer.h | 6 ------ 2 files changed, 0 insertions(+), 21 deletions(-) commit eaf7857b7f7ae6b05ce9d129157e0ff33ed2081b Author: Uoti Urpala Date: Mon Apr 28 12:09:31 2008 +0300 timers: Remove GetRelativeTime() Move the code calculating time delta since last query out of the platform-specific drivers and into mplayer.c. The platform-specific drivers now return absolute values only. The way the code in timer-darwin.c uses doubles in wrapping arithmetic looks questionable and this change might make problems in it more visible. mp_core.h | 5 +++++ mplayer.c | 24 +++++++++++++++++------- osdep/timer-darwin.c | 21 ++------------------- osdep/timer-linux.c | 13 ------------- osdep/timer-win2.c | 11 ----------- osdep/timer.h | 1 - 6 files changed, 24 insertions(+), 51 deletions(-) commit c693b77e935e7e34e21bafed2df0ff891d0e25ac Author: Uoti Urpala Date: Mon Apr 28 11:25:49 2008 +0300 osdep: Change timer_name to a saner type timer_name was a (non-const) pointer to a const char array. Make the symbol the array itself. osdep/timer-darwin.c | 2 +- osdep/timer-linux.c | 2 +- osdep/timer-win2.c | 2 +- osdep/timer.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit e5fab9566dbb408ebf651607d5ff58b5ed39453a Author: Uoti Urpala Date: Mon Apr 28 06:19:53 2008 +0300 m_option.h: #include for offsetof m_option.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 634af0168527dc8289c76dce12ec31b6cec1378d Author: Uoti Urpala Date: Mon Apr 28 04:52:57 2008 +0300 loader/qtx/qtxsdk/components.h: Disable large unused inline functions Put various dump_* functions under #if 0. They aren't used by any current code but trigger compiler warnings. loader/qtx/qtxsdk/components.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit fbdb41c321d4cec9a7bd281c9d6ed8fb1156e938 Author: Uoti Urpala Date: Mon Apr 28 04:45:58 2008 +0300 demux_mkv.c: Compiler warning fixes * libmpdemux/demux_mkv.c:218: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type * libmpdemux/demux_mkv.c:1235: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type Change grow_array to return the reallocated pointer instead of setting it through a void **. * libmpdemux/demux_mkv.c:1396: warning: unused variable ‘mkv_d’ Remove. * libmpdemux/demux_mkv.c:1740: warning: pointer of type ‘void *’ used in arithmetic Change struct mkv_track->private_data from void * to unsigned char *. * libmpdemux/demux_mkv.c:2693: warning: assignment from incompatible pointer type Add a cast. * libmpdemux/demux_mkv.c:2239: warning: ‘demux_mkv_reverse_id’ defined but not used Remove the function (together with preceding useless advance declaration of demux_mkv_seek). libmpdemux/demux_mkv.c | 43 ++++++++++++------------------------------- 1 files changed, 12 insertions(+), 31 deletions(-) commit 5c2583a0ee9a6e824bb1633748c1899bc99a695c Author: Uoti Urpala Date: Sun Apr 27 14:54:57 2008 +0300 Make MPlayer build with a complete FFmpeg checkout in ffmpeg/ Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/, libavformat/, libpostproc/ subdirectories make MPlayer build with a complete checkout of FFmpeg under ffmpeg/. configure now creates config.mak and config.h at both the top level and in ffmpeg/. The config.h files are identical. The config.mak for FFmpeg has different include paths. The top-level common.mak and subdir.mak are now used by libswscale only; the directories under ffmpeg/ use the versions in ffmpeg/. .gitignore | 1 + Makefile | 20 ++++++++++---------- common.mak | 2 +- configure | 33 +++++++++++++++++++-------------- dvdread/bswap.h | 2 +- 5 files changed, 32 insertions(+), 26 deletions(-) commit 2faffe2a7f4076beb461c34428d42b13e0414283 Merge: 38d50e9... ae09115... Author: Uoti Urpala Date: Mon Apr 28 03:58:36 2008 +0300 Merge svn changes up to r26555 commit 38d50e936919cbe03264c8c03fe40fc3af87d95c Author: Uoti Urpala Date: Sun Apr 27 04:59:37 2008 +0300 Add .gitignore files .gitignore | 16 ++++++++++++++++ vidix/.gitignore | 5 +++++ 2 files changed, 21 insertions(+), 0 deletions(-) commit 1b84ccbbfc6bb6dbc86333a40dea3cd9a306cf69 Author: Uoti Urpala Date: Sat Apr 26 16:53:47 2008 +0300 vd.c: Make extern decoder declarations const The earlier commit "Make video decoder description structs const" made the definitions const but didn't change the extern declarations in vd.c to match. Fix those to be const too. libmpcodecs/vd.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) commit 170d69a71ecd679d0b5c7f4b6aad008d9dfc0bdf Author: Uoti Urpala Date: Sat Apr 26 16:48:06 2008 +0300 Make audio decoder description structs const Make the per-decoder struct ad_functions and its ->info struct constants. Same for the mpcodecs_ad_drivers[] table of pointers to those structs. libmpcodecs/ad.c | 54 ++++++++++++++++++++++---------------------- libmpcodecs/ad.h | 4 +- libmpcodecs/ad_acm.c | 2 +- libmpcodecs/ad_alaw.c | 2 +- libmpcodecs/ad_dk3adpcm.c | 2 +- libmpcodecs/ad_dmo.c | 2 +- libmpcodecs/ad_dshow.c | 2 +- libmpcodecs/ad_dvdpcm.c | 2 +- libmpcodecs/ad_faad.c | 2 +- libmpcodecs/ad_ffmpeg.c | 2 +- libmpcodecs/ad_hwac3.c | 2 +- libmpcodecs/ad_hwmpa.c | 2 +- libmpcodecs/ad_imaadpcm.c | 2 +- libmpcodecs/ad_internal.h | 2 +- libmpcodecs/ad_liba52.c | 2 +- libmpcodecs/ad_libdca.c | 2 +- libmpcodecs/ad_libdv.c | 2 +- libmpcodecs/ad_libmad.c | 2 +- libmpcodecs/ad_libvorbis.c | 2 +- libmpcodecs/ad_mp3lib.c | 2 +- libmpcodecs/ad_mpc.c | 2 +- libmpcodecs/ad_msadpcm.c | 2 +- libmpcodecs/ad_msgsm.c | 2 +- libmpcodecs/ad_pcm.c | 2 +- libmpcodecs/ad_qtaudio.c | 2 +- libmpcodecs/ad_realaud.c | 2 +- libmpcodecs/ad_sample.c | 2 +- libmpcodecs/ad_speex.c | 2 +- libmpcodecs/ad_twin.c | 2 +- 29 files changed, 56 insertions(+), 56 deletions(-) commit def7ed045daee1b1342669a35a1e543b8720895d Author: Uoti Urpala Date: Sat Apr 26 16:36:16 2008 +0300 vf_divtc.c: Make pointlessly static variable a normal local Apparently because it was declared together with local constant tables (for which the "static" part was useless but harmless) a pointer variable was also declared static. libmpcodecs/vf_divtc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 05ad815133fcb0ade9a1040069dedba1abf9d6f0 Author: Uoti Urpala Date: Sat Apr 26 16:35:40 2008 +0300 Mark some constant symbols as such command.c | 2 +- input/input.c | 4 ++-- libmpcodecs/vf_delogo.c | 6 +++--- libmpcodecs/vf_eq.c | 4 ++-- libmpcodecs/vf_expand.c | 4 ++-- libmpcodecs/vf_format.c | 4 ++-- libmpcodecs/vf_geq.c | 4 ++-- libmpcodecs/vf_hue.c | 4 ++-- libmpcodecs/vf_noformat.c | 4 ++-- libmpcodecs/vf_noise.c | 2 +- libmpcodecs/vf_palette.c | 6 +++--- libmpcodecs/vf_pp.c | 2 +- libmpcodecs/vf_qp.c | 2 +- libmpcodecs/vf_scale.c | 16 ++++++++-------- libmpcodecs/vf_unsharp.c | 2 +- m_config.c | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) commit 37e1edee352afb6d1b212403a84827aa6072943a Author: Uoti Urpala Date: Sat Apr 26 15:31:39 2008 +0300 Move initialized_flags to mpctx The function exit_sighandler had a line if(initialized_flags==0 && sig_count>1) exit(1); rather than try to make this work without the variable I just removed the line as it looks unlikely this condition would occur except very rarely. mp_core.h | 1 + mplayer.c | 54 ++++++++++++++++++++++++++---------------------------- 2 files changed, 27 insertions(+), 28 deletions(-) commit 80d43e8632f3868261a68b75f5e55e5aa5156cd9 Author: Uoti Urpala Date: Sat Apr 26 15:17:51 2008 +0300 Move global filename to mpctx command.c | 19 +++++++------ libmenu/menu_filesel.c | 1 - mp_core.h | 1 + mplayer.c | 65 +++++++++++++++++++++++------------------------ mplayer.h | 2 - 5 files changed, 43 insertions(+), 45 deletions(-) commit ae0f9e26583fcb333018759df1c085b081615b61 Author: Uoti Urpala Date: Sat Apr 26 13:56:15 2008 +0300 Disable automatic playlist parsing properly The playlist code is unsafe to use with potentially hostile sources. It was disabled by default for local files but not for network streams. Make sure it is not automatically triggered for network streams either. mplayer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 529d1066274fc24c6a7ca5a8230c198167a5f7c0 Author: Uoti Urpala Date: Sat Apr 26 11:03:12 2008 +0300 Silence "discards qualifiers" warnings when compiling mplayer.c Add casts to subconfig entries in option lists to avoid the excessive amount of "initialization discards qualifiers from pointer target type" warnings. Also add const to the type of mpctx_get_audio_out to eliminate a warning and make it match the type in the header (svn r25793 had added a const to the header but not mplayer.c). Make libmenu_vfs a table of pointers to const to eliminate another warning plus make the table itself const. cfg-common-opts.h | 22 +++++++++++----------- cfg-mencoder.h | 8 ++++---- cfg-mplayer.h | 4 ++-- mplayer.c | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) commit fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 Author: Uoti Urpala Date: Sat Apr 26 10:44:59 2008 +0300 Move global mconfig to mpctx The global was used in the function cfg_include which handles the -include option. Make the address available in that function by creating a new dynamically allocated option in m_config_new that has the address in the option's private data. asxparser.c also used the global. Making it available through all ways the code could get called required a number of relatively straightforward changes to playtree and menu code. asxparser.c | 14 ++++++------ asxparser.h | 6 +++- cfg-common-opts.h | 1 - command.c | 2 +- libmenu/menu.c | 14 ++++++++--- libmenu/menu.h | 3 +- libmenu/menu_cmdlist.c | 2 +- libmenu/menu_param.c | 2 +- m_config.c | 11 +++++++- m_config.h | 3 +- mencoder.c | 2 +- mp_core.h | 1 + mplayer.c | 57 +++++++++++++++++++++++------------------------ parser-mpcmd.c | 8 ++++-- playtree.h | 5 ++- playtreeparser.c | 23 ++++++++++--------- playtreeparser.h | 3 +- 17 files changed, 89 insertions(+), 68 deletions(-) commit 6be229cbbfbe29ad61025051b1d903f5619e0b8a Author: Uoti Urpala Date: Sat Apr 26 08:53:26 2008 +0300 options: Fix multiple -v by simplifying CONF_TYPE_FUNC The CONF_TYPE_FUNC implementation counted how many times the option had appeared and called the function that many times when it was set. However each -v on the command line triggered an increase of the count _and_ as many calls as the current count indicated. Thus the resulting verbosity levels for 0 to 5 -v were really 0, 1, 3, 6, 10, 15 instead of 0, 1, 2, 3, 4, 5. Remove the counting functionality and just call the given function once at each set operation. This fixes -v; other options are not affected. m_option.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) commit 98b959ae1fadd70b7a8ac8259759b11d6ed4fb2d Author: Uoti Urpala Date: Sat Apr 26 08:27:33 2008 +0300 options: Remove "reset" functionality from CONF_TYPE_FUNC[_PARAM] The "reset to default before setting to something else" functionality is not used by any current option, but prevents using the "priv" field of the option data for anything else. m_option.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b Merge: 2993acd... 59f2911... Author: Uoti Urpala Date: Sat Apr 26 09:39:09 2008 +0300 Merge svn changes up to r26540 Conflicts: Makefile commit 2993acdc3118ec01274cf357336760443bfce561 Author: Uoti Urpala Date: Fri Apr 25 15:59:30 2008 +0300 Convert m_config.c to use talloc m_config.c | 94 ++++++++++++++++++++--------------------------------------- m_config.h | 2 - 2 files changed, 32 insertions(+), 64 deletions(-) commit 0885f4e5b560ced9e2a37f3057f8167510195750 Author: Uoti Urpala Date: Fri Apr 25 13:58:12 2008 +0300 Move vf_settings to options struct cfg-common-opts.h | 2 +- cfg-common.h | 1 - libmpcodecs/vf.c | 5 +++-- libmpcodecs/vf.h | 3 ++- m_option.h | 1 + mencoder.c | 2 +- mplayer.c | 8 ++++---- options.h | 1 + 8 files changed, 13 insertions(+), 10 deletions(-) commit e08c8d63789ff674b84075ddc18ec2a09d1deef7 Author: Uoti Urpala Date: Fri Apr 25 13:30:44 2008 +0300 options.h: Field order cosmetics Move correct_pts and user_correct_pts next to each other. loop_times was accidentally added between them. options.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4db72f6a8006ff137a7d6b8fcbc07da4fa94b9e0 Author: Uoti Urpala Date: Fri Apr 25 07:12:05 2008 +0300 Move vo_gamma_* to options struct cfg-mplayer.h | 8 ++++---- command.c | 13 +++++++------ defaultopts.c | 5 +++++ libmpcodecs/vd.c | 31 ++++++++++--------------------- libvo/video_out.h | 9 --------- options.h | 8 ++++++++ 6 files changed, 34 insertions(+), 40 deletions(-) commit a0de759a213120ed38c25a6b6d3811709010e2a5 Author: Uoti Urpala Date: Fri Apr 25 05:04:41 2008 +0300 command.c: cosmetic changes ("type * ptr" -> "type *ptr") These "type * ptr" cases were left in parameter lists from earlier automatic reindent. The "indent" binary does that when the type is an unrecognized typedef type. command.c | 238 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 119 insertions(+), 119 deletions(-) commit 31db39d8ec9cd2b8df0123e2f2142a187733ecad Author: Uoti Urpala Date: Thu Apr 24 08:43:56 2008 +0300 Make video decoder description structs const This makes the per-decoder struct vd_functions and its ->info struct constants. Same for the mpcodecs_vd_drivers[] table of pointers to those structs. libmpcodecs/dec_video.c | 14 +++++++------- libmpcodecs/vd.c | 2 +- libmpcodecs/vd.h | 4 ++-- libmpcodecs/vd_dmo.c | 2 +- libmpcodecs/vd_dshow.c | 2 +- libmpcodecs/vd_ffmpeg.c | 2 +- libmpcodecs/vd_hmblck.c | 2 +- libmpcodecs/vd_ijpg.c | 2 +- libmpcodecs/vd_internal.h | 2 +- libmpcodecs/vd_libdv.c | 2 +- libmpcodecs/vd_libmpeg2.c | 2 +- libmpcodecs/vd_lzo.c | 2 +- libmpcodecs/vd_mpegpes.c | 2 +- libmpcodecs/vd_mpng.c | 2 +- libmpcodecs/vd_mtga.c | 2 +- libmpcodecs/vd_null.c | 2 +- libmpcodecs/vd_nuv.c | 2 +- libmpcodecs/vd_qtvideo.c | 2 +- libmpcodecs/vd_raw.c | 2 +- libmpcodecs/vd_realvid.c | 2 +- libmpcodecs/vd_sgi.c | 2 +- libmpcodecs/vd_theora.c | 2 +- libmpcodecs/vd_vfw.c | 2 +- libmpcodecs/vd_xanim.c | 2 +- libmpcodecs/vd_xvid4.c | 2 +- libmpcodecs/vd_zrmjpeg.c | 2 +- libmpdemux/stheader.h | 2 +- 27 files changed, 34 insertions(+), 34 deletions(-) commit 7dc42263486bd45d2ba830f065a8556c02aaf7c8 Author: Uoti Urpala Date: Thu Apr 24 08:20:59 2008 +0300 Move vd_use_slices to options struct cfg-common-opts.h | 4 ++-- defaultopts.c | 1 + libmpcodecs/vd.c | 3 --- libmpcodecs/vd.h | 2 -- libmpcodecs/vd_ffmpeg.c | 2 +- libmpcodecs/vd_libmpeg2.c | 4 ++-- options.h | 1 + 7 files changed, 7 insertions(+), 10 deletions(-) commit bb679dd40a80e72272dec0c8621b888f4365852c Author: Uoti Urpala Date: Thu Apr 24 08:16:11 2008 +0300 Remove global vo_flags Move the information to struct sh_video field. libmpcodecs/vd.c | 7 +++---- libmpdemux/stheader.h | 1 + libvo/video_out.c | 2 -- libvo/video_out.h | 2 -- mplayer.c | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) commit 60f104d4aaf9f1f990045ca255c343e77ed3078c Author: Uoti Urpala Date: Thu Apr 24 07:52:15 2008 +0300 vd.c: Cosmetic changes + remove malloc.h Adjust formatting slightly and remove some comments. Also remove "#include malloc.h" which seems completely irrelevant. libmpcodecs/vd.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) commit 6e0199537cd89bc68c6b1836a434693b48e05de7 Author: Uoti Urpala Date: Thu Apr 24 07:49:01 2008 +0300 Reformat vd.c "indent -kr -l79 -nut dec_video.c --ignore-newlines vd.c", fix two "sh_video_t * sh" to "sh_video_t *sh" by hand. libmpcodecs/vd.c | 410 +++++++++++++++++++++++++++++------------------------- 1 files changed, 221 insertions(+), 189 deletions(-) commit 60e2c8604d29963e8b4a4dc5f506a3886c58202d Author: Uoti Urpala Date: Thu Apr 24 07:36:43 2008 +0300 Move movie_aspect to options struct cfg-common-opts.h | 4 ++-- cfg-common.h | 3 --- command.c | 4 ++-- defaultopts.c | 1 + libmpcodecs/vd.c | 3 +-- libvo/aspect.c | 1 - libvo/old_vo_defines.h | 1 + libvo/vo_dxr2.c | 1 - libvo/vo_quartz.c | 1 - mplayer.h | 1 - options.h | 1 + 11 files changed, 8 insertions(+), 13 deletions(-) commit 0a39709c15890161388e6d32cceea2ff3350aa82 Author: Uoti Urpala Date: Thu Apr 24 07:28:20 2008 +0300 Move screen_size_xy to options struct cfg-common-opts.h | 2 +- cfg-common.h | 1 - libmpcodecs/vd.c | 15 +++++++-------- libmpcodecs/vf_scale.c | 4 +--- options.h | 1 + 5 files changed, 10 insertions(+), 13 deletions(-) commit b14909a955259c3b9c3494a5096ceed81397926c Author: Uoti Urpala Date: Thu Apr 24 07:23:15 2008 +0300 Move opt_screen_size_[x|y] to options struct cfg-mplayer.h | 7 ++----- libmpcodecs/vd.c | 8 +++----- libmpcodecs/vf_ass.c | 7 +++---- libmpcodecs/vf_crop.c | 7 +++---- libmpcodecs/vf_expand.c | 10 +++++----- libmpcodecs/vf_filmdint.c | 7 +++---- libmpcodecs/vf_scale.c | 7 ++++--- options.h | 2 ++ 8 files changed, 25 insertions(+), 30 deletions(-) commit 1351b50ea5e12d0b316c0670a525f1a75be3100b Author: Uoti Urpala Date: Thu Apr 24 07:14:05 2008 +0300 Move flip and softzoom to options struct cfg-common-opts.h | 8 ++++---- cfg-common.h | 2 -- defaultopts.c | 1 + libmpcodecs/vd.c | 16 +++++++--------- mplayer.h | 3 --- options.h | 2 ++ 6 files changed, 14 insertions(+), 18 deletions(-) commit 0dc3a72273127e28aec60b39373b48ad8da80c57 Author: Uoti Urpala Date: Thu Apr 24 07:01:53 2008 +0300 Move vidmode to options struct cfg-mplayer.h | 5 ++--- libmpcodecs/vd.c | 5 ++--- libvo/old_vo_defines.h | 1 + libvo/vo_directx.c | 2 -- options.h | 1 + 5 files changed, 6 insertions(+), 8 deletions(-) commit 41d6879236d2792300c57fc9825878ba4f634edd Author: Uoti Urpala Date: Thu Apr 24 06:58:16 2008 +0300 Move fullscreen to options struct cfg-mplayer.h | 5 ++--- libmpcodecs/vd.c | 4 ++-- mplayer.h | 1 - options.h | 1 + 4 files changed, 5 insertions(+), 6 deletions(-) commit 342ae8d3b5597d59e6a3650ca78ed7f1eb070c4e Author: Uoti Urpala Date: Thu Apr 24 06:41:12 2008 +0300 Store video decoder functions in struct sh_video field Remove the global variable mpvdec and move the video decoder pointer to struct sh_video field vd_driver. Audio already had a similar ad_driver field from before. libmpcodecs/dec_video.c | 52 +++++++++++++++++++++++++--------------------- libmpcodecs/vd.c | 6 +--- libmpdemux/stheader.h | 1 + 3 files changed, 31 insertions(+), 28 deletions(-) commit 0e757bf9daa55db9fa7052efe5aef09f90044054 Author: Uoti Urpala Date: Thu Apr 24 05:49:44 2008 +0300 Remove _s/_st suffix from some struct names Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless. DOCS/tech/libmpcodecs.txt | 20 ++++++++++---------- codec-cfg.h | 2 +- libaf/af.h | 2 +- libao2/audio_out.h | 3 +-- libmenu/vf_menu.c | 12 ++++++------ libmpcodecs/ad.h | 2 +- libmpcodecs/mp_image.h | 2 +- libmpcodecs/vd.c | 2 +- libmpcodecs/vd.h | 2 +- libmpcodecs/ve_lavc.c | 14 +++++++------- libmpcodecs/ve_libdv.c | 8 ++++---- libmpcodecs/ve_nuv.c | 10 +++++----- libmpcodecs/ve_qtvideo.c | 8 ++++---- libmpcodecs/ve_raw.c | 10 +++++----- libmpcodecs/ve_vfw.c | 10 +++++----- libmpcodecs/ve_x264.c | 16 ++++++++-------- libmpcodecs/ve_xvid4.c | 10 +++++----- libmpcodecs/vf.c | 14 +++++++------- libmpcodecs/vf.h | 38 +++++++++++++++++++------------------- libmpcodecs/vf_1bpp.c | 8 ++++---- libmpcodecs/vf_2xsai.c | 6 +++--- libmpcodecs/vf_ass.c | 20 ++++++++++---------- libmpcodecs/vf_blackframe.c | 10 +++++----- libmpcodecs/vf_bmovl.c | 8 ++++---- libmpcodecs/vf_boxblur.c | 6 +++--- libmpcodecs/vf_crop.c | 8 ++++---- libmpcodecs/vf_cropdetect.c | 6 +++--- libmpcodecs/vf_decimate.c | 4 ++-- libmpcodecs/vf_delogo.c | 10 +++++----- libmpcodecs/vf_denoise3d.c | 8 ++++---- libmpcodecs/vf_detc.c | 10 +++++----- libmpcodecs/vf_dint.c | 4 ++-- libmpcodecs/vf_divtc.c | 6 +++--- libmpcodecs/vf_down3dright.c | 8 ++++---- libmpcodecs/vf_dsize.c | 2 +- libmpcodecs/vf_dvbscale.c | 2 +- libmpcodecs/vf_eq.c | 8 ++++---- libmpcodecs/vf_expand.c | 22 +++++++++++----------- libmpcodecs/vf_field.c | 6 +++--- libmpcodecs/vf_fil.c | 6 +++--- libmpcodecs/vf_filmdint.c | 10 +++++----- libmpcodecs/vf_flip.c | 6 +++--- libmpcodecs/vf_format.c | 2 +- libmpcodecs/vf_framestep.c | 4 ++-- libmpcodecs/vf_fspp.c | 12 ++++++------ libmpcodecs/vf_geq.c | 14 +++++++------- libmpcodecs/vf_halfpack.c | 8 ++++---- libmpcodecs/vf_harddup.c | 6 +++--- libmpcodecs/vf_hqdn3d.c | 8 ++++---- libmpcodecs/vf_hue.c | 8 ++++---- libmpcodecs/vf_il.c | 2 +- libmpcodecs/vf_ilpack.c | 6 +++--- libmpcodecs/vf_ivtc.c | 8 ++++---- libmpcodecs/vf_kerndeint.c | 10 +++++----- libmpcodecs/vf_lavc.c | 6 +++--- libmpcodecs/vf_lavcdeint.c | 6 +++--- libmpcodecs/vf_mcdeint.c | 10 +++++----- libmpcodecs/vf_mirror.c | 2 +- libmpcodecs/vf_noformat.c | 2 +- libmpcodecs/vf_noise.c | 10 +++++----- libmpcodecs/vf_ow.c | 10 +++++----- libmpcodecs/vf_palette.c | 8 ++++---- libmpcodecs/vf_perspective.c | 8 ++++---- libmpcodecs/vf_phase.c | 4 ++-- libmpcodecs/vf_pp.c | 12 ++++++------ libmpcodecs/vf_pp7.c | 12 ++++++------ libmpcodecs/vf_pullup.c | 12 ++++++------ libmpcodecs/vf_qp.c | 8 ++++---- libmpcodecs/vf_rectangle.c | 6 +++--- libmpcodecs/vf_remove_logo.c | 8 ++++---- libmpcodecs/vf_rgb2bgr.c | 6 +++--- libmpcodecs/vf_rgbtest.c | 6 +++--- libmpcodecs/vf_rotate.c | 6 +++--- libmpcodecs/vf_sab.c | 8 ++++---- libmpcodecs/vf_scale.c | 14 +++++++------- libmpcodecs/vf_screenshot.c | 12 ++++++------ libmpcodecs/vf_smartblur.c | 8 ++++---- libmpcodecs/vf_softpulldown.c | 6 +++--- libmpcodecs/vf_softskip.c | 8 ++++---- libmpcodecs/vf_spp.c | 12 ++++++------ libmpcodecs/vf_swapuv.c | 6 +++--- libmpcodecs/vf_telecine.c | 8 ++++---- libmpcodecs/vf_test.c | 6 +++--- libmpcodecs/vf_tfields.c | 12 ++++++------ libmpcodecs/vf_tile.c | 8 ++++---- libmpcodecs/vf_tinterlace.c | 8 ++++---- libmpcodecs/vf_unsharp.c | 10 +++++----- libmpcodecs/vf_uspp.c | 12 ++++++------ libmpcodecs/vf_vo.c | 18 +++++++++--------- libmpcodecs/vf_yadif.c | 14 +++++++------- libmpcodecs/vf_yuvcsp.c | 8 ++++---- libmpcodecs/vf_yuy2.c | 6 +++--- libmpcodecs/vf_yvu9.c | 6 +++--- libmpcodecs/vf_zrmjpeg.c | 6 +++--- libmpdemux/demux_nemesi.c | 2 +- libmpdemux/demuxer.c | 2 +- libmpdemux/demuxer.h | 34 +++++++++++++++++----------------- libmpdemux/stheader.h | 10 +++++----- mp_core.h | 10 +++++----- mplayer.c | 2 +- playtree.h | 4 ++-- playtreeparser.h | 6 +++--- stream/stream.h | 16 ++++++++-------- stream/stream_netstream.c | 6 +++--- stream/stream_radio.c | 18 +++++++++--------- stream/stream_radio.h | 12 ++++++------ stream/stream_rtsp.c | 2 +- stream/stream_vstream.c | 4 ++-- subreader.h | 6 +++--- 109 files changed, 464 insertions(+), 465 deletions(-) commit 6f971b635434609e69d7c326b1f3eded88d2caf2 Author: Uoti Urpala Date: Thu Apr 24 05:31:33 2008 +0300 dec_video.c: A couple of cosmetic changes libmpcodecs/dec_video.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) commit e5b3655e90bdd86809f532590dc8e0277093daad Author: Uoti Urpala Date: Thu Apr 24 05:23:45 2008 +0300 Reformat dec_video.c "indent -kr -l79 -nut dec_video.c --ignore-newlines dec_video.c", fix some "unknown_typedef * arg" in parameter lists by hand to "unrecognized_typedef *arg". libmpcodecs/dec_video.c | 548 +++++++++++++++++++++++++---------------------- 1 files changed, 293 insertions(+), 255 deletions(-) commit 3fa6f2d3e1814783db8cc5574136b89facd78ebc Author: Uoti Urpala Date: Thu Apr 24 03:59:21 2008 +0300 Move -lavdopts to options struct defaultopts.c | 6 ++ libmpcodecs/vd_ffmpeg.c | 122 +++++++++++++++++++++-------------------------- m_option.h | 1 + options.h | 19 +++++++ 4 files changed, 80 insertions(+), 68 deletions(-) commit 15b34d1fd86f252bf811594bbc265a3f977e4775 Author: Uoti Urpala Date: Thu Apr 24 03:22:37 2008 +0300 vd_ffmpeg.c: Eliminate some compiler warnings Make the functions used in avctx->draw_horiz_band match its type (add a "const"). Add cast to avoid void * arithmetic. libmpcodecs/vd_ffmpeg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit f8934a5f12aea53a57b728ad0b56d6198a545e8c Author: Uoti Urpala Date: Thu Apr 24 02:10:37 2008 +0300 Modify option helper macros Give them a OPT_ prefix, move them to m_option.h, move the "flags" parameter to third position (so all start with option name, field name, flags) and use "&m_option_type_x" in them instead of the indirect #define "CONF_TYPE_X". cfg-common-opts.h | 14 +++++++------- cfg-common.h | 7 ------- cfg-mplayer.h | 26 +++++++++++++------------- m_option.h | 7 +++++++ 4 files changed, 27 insertions(+), 27 deletions(-) commit 70e0372a51ec0d040e996d56101b731a4b72d11d Merge: e14d43f... c051bef... Author: Uoti Urpala Date: Wed Apr 23 14:23:49 2008 +0300 Merge svn changes up to r26510 r26469 and r26470 (which revert files to inferior versions "because it's policy") are ignored. commit e14d43f764c5043e5907852e09d61db912ee49f2 Author: Uoti Urpala Date: Wed Apr 23 14:10:19 2008 +0300 Remove -Wdeclaration-after-statement from CFLAGS The warnings are pointless and clutter output. configure | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit c510959da57b20a316d388661c4a873d27c4dc8f Author: Uoti Urpala Date: Wed Apr 23 09:49:25 2008 +0300 Remove some unnecessary recursive includes Remove some #include lines from headers, some of those removals made possible by using incomplete struct types instead of typedefs. Include mp_osd.h in mplayer.c and command.c after removing it from mp_core.h. Remove "#ifdef USE_ASS" around some "struct ass_track_s *" fields which will now compile even without ASS support. command.c | 1 + libmpdemux/demuxer.h | 5 +---- libmpdemux/stheader.h | 9 +++------ mp_core.h | 31 +++++++++++-------------------- mplayer.c | 1 + 5 files changed, 17 insertions(+), 30 deletions(-) commit 66bd120a3a8c15ee3bd7ce41e7258e8b33925864 Author: Uoti Urpala Date: Wed Apr 23 07:41:17 2008 +0300 Move dvdsub_id to options struct Name the field "sub_id" as it's not specific to DVD subs. Remove some other unused extern declarations together with dvdsub_id from demux_mkv.c and demux_lavf.c. cfg-common-opts.h | 2 +- command.c | 37 +++++++++++++++++++------------------ defaultopts.c | 1 + libmpdemux/demux_lavf.c | 3 --- libmpdemux/demux_mkv.c | 5 ----- libmpdemux/demux_ogg.c | 4 ++-- libmpdemux/demuxer.c | 2 -- mencoder.c | 23 +++++++++++------------ mpcommon.c | 7 +++++-- mplayer.c | 31 +++++++++++++++---------------- mplayer.h | 1 - options.h | 1 + 12 files changed, 55 insertions(+), 62 deletions(-) commit c0c914effd94324362e4ca70204f1b08783f6121 Author: Uoti Urpala Date: Wed Apr 23 07:01:31 2008 +0300 Move audio_id and video_id to options struct cfg-common-opts.h | 10 +++++----- command.c | 40 +++++++++++++++++++++------------------- defaultopts.c | 2 ++ mencoder.c | 16 +++++++--------- mplayer.c | 11 ++++------- mplayer.h | 2 -- options.h | 2 ++ stream/asf_mmst_streaming.c | 3 ++- stream/asf_streaming.c | 18 +++++++++--------- stream/network.h | 3 +++ 10 files changed, 55 insertions(+), 52 deletions(-) commit f518cf7ea99e9282508f551ecb43892f6aabcbc4 Author: Uoti Urpala Date: Wed Apr 23 06:35:36 2008 +0300 Add option pointer to stream struct (at least temporarily) The stream code does not access many option variables directly, but it does access some such as audio_id and network_bandwidth (and does that without including proper headers for them). Add option pointer to the stream struct to allow access to those variables. Remove the unused (always NULL) and clumsy-looking char** options parameter in the open_stream call and replace it with the option pointer. The parameter is currently only set in the main open_stream() call in MPlayer.c and not in any other locations that can open a stream. In the long term it might be better to pass a more limited set of values somehow, but this should do for now. mplayer.c | 2 +- stream/open.c | 3 ++- stream/stream.c | 26 +++++++++++--------------- stream/stream.h | 8 +++++--- 4 files changed, 19 insertions(+), 20 deletions(-) commit 9e7dfe3fa34ca05fb63cd34369f7c847b777516d Author: Uoti Urpala Date: Wed Apr 23 06:14:53 2008 +0300 Mark some functions static These functions aren't used outside their file and have no prototype in any header. Based on a forgotten patch from 2006 by Stefan Huehner, (stefan huehner org). libmpdemux/aviheader.c | 2 +- libmpdemux/demux_avi.c | 4 +++- libmpdemux/parse_mp4.c | 2 +- stream/cache2.c | 8 ++++---- stream/stream.c | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) commit d9aa368a6d8dcbea2cd03b6c2a6c2e6df5fc16ce Author: Uoti Urpala Date: Mon Apr 21 06:55:23 2008 +0300 Move playback_speed to options struct cfg-common-opts.h | 2 +- cfg-common.h | 1 + command.c | 34 ++++++++++++++----------------- defaultopts.c | 1 + mencoder.c | 37 ++++++++++++++++----------------- mp_core.h | 4 +-- mplayer.c | 57 ++++++++++++++++++++++++++++------------------------ options.h | 1 + 8 files changed, 69 insertions(+), 68 deletions(-) commit c2a36d9264313d00f696bb7decff55877fc7596e Author: Uoti Urpala Date: Mon Apr 21 06:36:26 2008 +0300 Move option helper #defines to cfg-common.h for now cfg-common.h | 6 ++++++ cfg-mplayer.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) commit ca63fdcf0367191188ab78c18b6c42efac5bc4c0 Author: Uoti Urpala Date: Mon Apr 21 06:34:07 2008 +0300 cfg-common-opts.h: Remove multiple inclusion guards and #include This file cannot be used as a normal header so the multiple inclusion guards are pointless, and the only reason the '#include "config.h"' did not break compilation was that it compiled to whitespace only due to its own multiple inclusion guard. cfg-common-opts.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) commit 3ee6503a078a45f1506fa0daaa768a511d58fcf0 Author: Uoti Urpala Date: Mon Apr 21 06:17:22 2008 +0300 Move global rel_seek_secs and abs_seek_pos to mpctx command.c | 30 +++++++++++++++--------------- mp_core.h | 6 ++++-- mplayer.c | 22 +++++++++------------- 3 files changed, 28 insertions(+), 30 deletions(-) commit c1f9fe7d673ab7c34232a1fe9312e60f81503ccf Author: Uoti Urpala Date: Mon Apr 21 06:07:22 2008 +0300 Remove static mpctx from mplayer.c Pass it in function calls instead. There's no reasonable way to pass it to exit_player() when used outside mplayer.c. However most of those uses seem to be wrong (the code should not make the program exit) and should be removed. For now just make exit_player() uses outside mplayer.c simply call exit() without any shutdown code. command.c | 56 ++++++++-------- metadata.h | 4 +- mp_core.h | 14 ++-- mp_osd.h | 4 +- mplayer.c | 219 +++++++++++++++++++++++++++++++---------------------------- mplayer.h | 14 +++- 6 files changed, 168 insertions(+), 143 deletions(-) commit ef74d21b1f1d96b2e3f180c021998fbdd80ffcba Author: Uoti Urpala Date: Mon Apr 21 05:18:40 2008 +0300 Move loop_times to option struct cfg-mplayer.h | 5 +++-- command.c | 7 ++++--- defaultopts.c | 1 + mp_core.h | 1 - mplayer.c | 13 ++++++------- options.h | 1 + 6 files changed, 15 insertions(+), 13 deletions(-) commit 67778746ce3c917d874baa7c2e6b2a21a50c27e2 Author: Uoti Urpala Date: Mon Apr 21 05:07:08 2008 +0300 Remove pointless #ifdefs These #ifdefs only made MPContext 2 variables smaller when dvbin support was disabled. mp_core.h | 2 -- mplayer.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) commit db8924ea3c3a0dd8243c61cf3d7bf5f8807796ed Author: Uoti Urpala Date: Mon Apr 21 04:59:00 2008 +0300 Move mRootWin,mScreen,mLocalDisplay to x11 struct libvo/vo_xv.c | 6 ++-- libvo/x11_common.c | 58 +++++++++++++++++++++++++-------------------------- libvo/x11_common.h | 6 +++++ 3 files changed, 37 insertions(+), 33 deletions(-) commit 0ef3e9ae879a9425eac3b04ce78121e1fdd15af8 Author: Uoti Urpala Date: Mon Apr 21 04:50:29 2008 +0300 Move vo_mouse_autohide,vo_wm_type,vo_fs_type,vo_fs_flip to x11 struct libvo/vo_xv.c | 2 +- libvo/x11_common.c | 49 ++++++++++++++++++++++--------------------------- libvo/x11_common.h | 8 ++++++-- 3 files changed, 29 insertions(+), 30 deletions(-) commit cc8334710e25d3f814bd6668b2cc47adf9921283 Author: Uoti Urpala Date: Mon Apr 21 04:41:52 2008 +0300 x11_common: Move vo_old_[x|y|width|height| to x11 struct libvo/x11_common.c | 32 ++++++++++++++------------------ libvo/x11_common.h | 5 +++++ 2 files changed, 19 insertions(+), 18 deletions(-) commit 52b3c6097b7cc1e204a139ef778b6ed7972e30ec Author: Uoti Urpala Date: Mon Apr 21 04:37:46 2008 +0300 x11_common.c: Move orig_layer and old_gravity to x11 struct libvo/x11_common.c | 15 +++++++-------- libvo/x11_common.h | 2 ++ 2 files changed, 9 insertions(+), 8 deletions(-) commit 49ac1f06cac12dd412a14473e5fd0d5b7c8cf001 Author: Uoti Urpala Date: Mon Apr 21 04:25:10 2008 +0300 Move static mouse hide timers to x11 struct libvo/x11_common.c | 21 +++++++++------------ libvo/x11_common.h | 2 ++ 2 files changed, 11 insertions(+), 12 deletions(-) commit 49461e04d0ecbf08c636f80b6aa1617db061e92f Author: Uoti Urpala Date: Mon Apr 21 04:19:43 2008 +0300 Move vo_gc,f_gc,vo_hints to x11 struct libvo/vo_xv.c | 10 ++-- libvo/x11_common.c | 108 +++++++++++++++++++++++++-------------------------- libvo/x11_common.h | 9 +++- 3 files changed, 64 insertions(+), 63 deletions(-) commit 5f39342e01cbbe6527814724a90124a4ff537721 Author: Uoti Urpala Date: Mon Apr 21 04:09:26 2008 +0300 x11_common.c: Move function-static variables to struct libvo/x11_common.c | 49 +++++++++++++++++++++++++------------------------ libvo/x11_common.h | 6 +++++- 2 files changed, 30 insertions(+), 25 deletions(-) commit dd784ca40819125d35a24a258c51e96515f77c75 Author: Uoti Urpala Date: Mon Apr 21 03:53:13 2008 +0300 Mark a table const libvo/x11_common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e66e17adc13638dd99088a1b7f06fd6fa7d64527 Author: Uoti Urpala Date: Mon Apr 21 03:43:03 2008 +0300 Move xv_port,xv_colorkey,xv_ck_info to x11 struct libvo/vo_xv.c | 40 +++++++++++++------------- libvo/x11_common.c | 77 +++++++++++++++++++++++++-------------------------- libvo/x11_common.h | 27 +++++++++--------- 3 files changed, 71 insertions(+), 73 deletions(-) commit 40f02f64fde7d00ecc49adb5d2130058ee0c8466 Author: Uoti Urpala Date: Mon Apr 21 03:14:37 2008 +0300 Move vo_window to x11 struct libvo/vo_xv.c | 33 +++++++------- libvo/x11_common.c | 127 ++++++++++++++++++++++++--------------------------- libvo/x11_common.h | 6 +- 3 files changed, 80 insertions(+), 86 deletions(-) commit 7159af499c3bab41e37eb27dcbcae20bd4bb999d Author: Uoti Urpala Date: Mon Apr 21 02:50:40 2008 +0300 Move static X11 atoms to struct libvo/vo_xv.c | 2 +- libvo/x11_common.c | 103 ++++++++++++++++++++++++---------------------------- libvo/x11_common.h | 19 +++++++++- 3 files changed, 65 insertions(+), 59 deletions(-) commit 78172918ff4c7df7c9d1305dbfc48a8df409e470 Author: Uoti Urpala Date: Mon Apr 21 02:18:28 2008 +0300 Move vo_screenwidth,vo_screenheight to options struct cfg-mplayer.h | 4 +- command.c | 11 ++++--- libvo/old_vo_defines.h | 2 + libvo/video_out.c | 11 ++---- libvo/video_out.h | 4 -- libvo/vo_xv.c | 15 +++++---- libvo/x11_common.c | 77 ++++++++++++++++++++++++++--------------------- libvo/x11_common.h | 6 ++- options.h | 2 + 9 files changed, 71 insertions(+), 61 deletions(-) commit 432e8ff4a568b1040cae43df4aa6a602c86c6162 Author: Uoti Urpala Date: Mon Apr 21 01:50:19 2008 +0300 Move vo_depthonscreen to x11 struct libvo/video_out.c | 1 - libvo/video_out.h | 1 - libvo/x11_common.c | 22 +++++++++++----------- libvo/x11_common.h | 2 ++ 4 files changed, 13 insertions(+), 13 deletions(-) commit a2212a71a74718d71673336a6b08b11f6cf1535b Author: Uoti Urpala Date: Mon Apr 21 01:44:53 2008 +0300 Remove vo_depthonscreen references from non-X VOs X-specific code uses this global as its internal variable (assuming that X is initialized if it is set). While using non-X VOs the variable is not accessed outside the VO. So make those VOs use their own variables instead of the global vo_depthonscreen. libvo/vo_ggi.c | 10 ++++++---- libvo/vo_winvidix.c | 5 +++-- libvo/w32_common.c | 11 ++++++----- 3 files changed, 15 insertions(+), 11 deletions(-) commit ce76dfdd4ac46e955cc57c6f5c7ae98d8018abab Author: Uoti Urpala Date: Mon Apr 21 00:37:12 2008 +0300 Move vo_dbpp to options struct cfg-mplayer.h | 3 ++- libvo/old_vo_defines.h | 2 +- libvo/video_out.c | 3 --- libvo/video_out.h | 5 ++--- options.h | 1 + 5 files changed, 6 insertions(+), 8 deletions(-) commit eaab1ce896adbcb58e6503ea2dcf789d99bd29f5 Author: Uoti Urpala Date: Sun Apr 20 23:29:28 2008 +0300 Move vo_dx,vo_dy,vo_dwidth,vo_dheight to vo struct command.c | 26 ++++++++------- libvo/mga_common.c | 1 + libvo/old_vo_defines.h | 4 ++ libvo/video_out.c | 18 ++++------- libvo/video_out.h | 8 ++-- libvo/vo_xv.c | 78 ++++++++++++++++++++++++------------------------ libvo/x11_common.c | 39 ++++++++++++----------- libvo/x11_common.h | 3 +- 8 files changed, 91 insertions(+), 86 deletions(-) commit 7521aac66509d18666b7737160153986cc1437ac Author: Uoti Urpala Date: Fri Apr 18 06:28:47 2008 +0300 Move global vo_config_count to vo struct Remove the global and Add a corresponding field to the vo struct, plus another which tells whether the LAST config call was successful.The latter value which tells whether the VO should be properly configured at the moment seems a better match for the semantics actually needed in most places where the old value was used. The 'count' field with the old semantics is not currently used by anything, but I'm leaving it there for vo drivers which would need those semantics if converted to use the struct. Existing uses of the global outside old vo drivers are either converted to use the struct field or moved inside the vo_xyz() calls (instead of "if (vo_config_count) vo_flip_page(..." just call vo_flip_page which will now do nothing if not configured). The removal of the check in mpcommon.c/update_subtitles() is less trivial than the others, but I think it shouldn't cause problems. command.c | 8 ++++---- libmpcodecs/vf_vo.c | 19 +++++++++---------- libvo/old_vo_defines.h | 1 + libvo/video_out.c | 17 +++++++++++++---- libvo/video_out.h | 4 ++-- libvo/vo_xv.c | 2 +- mencoder.c | 1 - mpcommon.c | 3 +-- mplayer.c | 17 +++++++---------- 9 files changed, 38 insertions(+), 34 deletions(-) commit 26039a38e3d5a2305e0ec93481df07c2717aa06d Author: Uoti Urpala Date: Sun Apr 20 09:34:27 2008 +0300 Move global mDisplay to x11 state struct libvo/gl_common.c | 1 + libvo/vo_xv.c | 104 +++++++++++---------- libvo/x11_common.c | 262 +++++++++++++++++++++++++++------------------------- libvo/x11_common.h | 52 +++++++---- mplayer.c | 6 +- 5 files changed, 228 insertions(+), 197 deletions(-) commit acf319b3edea4d8dd0fe338778e08e0d99dc49bb Author: Uoti Urpala Date: Sun Apr 20 07:36:34 2008 +0300 Create a struct for X11 state Will be used for common data between X11 VOs. The main reasons for making it a separate struct rather than extra fields in the main VO struct are that some field definitions need X headers and that the code keeps basic X state such as the display connection over opening and closing of individual VOs. libvo/video_out.c | 9 ++++++--- libvo/video_out.h | 3 ++- libvo/x11_common.c | 4 ++++ libvo/x11_common.h | 5 +++++ mp_core.h | 1 + mplayer.c | 7 ++++++- 6 files changed, 24 insertions(+), 5 deletions(-) commit d283d5236ab36bc55c73de4e152dabea7098f850 Author: Uoti Urpala Date: Sun Apr 20 06:39:29 2008 +0300 x11_common.c: Make some functions static libvo/x11_common.c | 14 ++++++++------ libvo/x11_common.h | 9 --------- 2 files changed, 8 insertions(+), 15 deletions(-) commit 1ebfddd812230d641d934d312646638dd7091ba9 Author: Uoti Urpala Date: Sun Apr 20 06:04:10 2008 +0300 Allocate vo struct with talloc Also allocate the private vo_xv struct as a child and remove explicit free() for it. libvo/video_out.c | 5 +++-- libvo/vo_xv.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) commit 95a909b4fd758c16ed1fb1449fa7294d9c44ab91 Author: Uoti Urpala Date: Sun Apr 20 05:45:44 2008 +0300 Makefile: Compile and link talloc.c Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 7c0e5e8f99f01001b46377c200dbf3850821a0ec Author: Uoti Urpala Date: Sun Apr 20 05:42:11 2008 +0300 Make talloc abort() instead of returning NULL Replace (hopefully) all cases where normally successful allocations could return NULL with abort(). This should allow skipping most checks on allocation return values. talloc.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit c0c9b26ff96df8dfe89c4c52c70e2c6b2e30100f Author: Uoti Urpala Date: Sun Apr 20 05:13:25 2008 +0300 Hardcode feature checks in talloc.c Original talloc build system used autoconf to check for features, most of which were standard C headers. Assume those always exist. Always use a workaround for the one non-standard feature (strnlen). talloc.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) commit 27a30e310e1d2b2bbc9b381fe08b6ade403784e2 Author: Uoti Urpala Date: Sun Apr 20 04:38:27 2008 +0300 Add the talloc memory allocator Copy talloc.c and talloc.h from Samba (last changed 2008-04-17 in commit 7b9a647ebbbe9ec9e1b82b42e3a8916396f91273). talloc.c | 1724 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ talloc.h | 183 +++++++ 2 files changed, 1907 insertions(+), 0 deletions(-) commit bfe569b76ebc19263efbf717728a6da7c413cbac Author: Uoti Urpala Date: Sat Apr 19 07:45:16 2008 +0300 Move vo_ontop to options struct Add a 'struct vo *vo' argument to the x11_common.c functions that access the variable so it's available as vo->opts->vo_ontop. To keep VOs using the old API working create a global vo variable that is set to the currently used old vo. "vo_ontop" will be #defined to "global_vo->opts->vo_ontop", and x11_common.h will add defines like the following when it is included by old VOs: #define vo_x11_ontop() vo_x11_ontop(global_vo) so that they will call the function according to the new declaration. cfg-mplayer.h | 4 ++-- command.c | 4 ++-- libvo/old_vo_defines.h | 13 +++++++++++++ libvo/old_vo_wrapper.c | 3 +++ libvo/old_vo_wrapper.h | 2 ++ libvo/video_out.c | 1 - libvo/video_out.h | 1 - libvo/video_out_internal.h | 1 + libvo/vo_xv.c | 12 +++++++----- libvo/w32_common.c | 2 ++ libvo/x11_common.c | 22 +++++++++++++--------- libvo/x11_common.h | 18 ++++++++++++++---- options.h | 1 + 13 files changed, 60 insertions(+), 24 deletions(-) commit 6c9d09170d70df6e915b6e98906b7625c0c52c64 Author: Uoti Urpala Date: Sat Apr 19 07:13:32 2008 +0300 vo_gl[2]: Rename conflicting vo_ontop macro Rename the vo_ontop() macro to vo_gl_ontop(). It caused problems with other changes because it conflicts with a global variable name (gl2 actually called vo_ontop() as a function and used vo_ontop as an int - this only worked because vo_ontop was defined as a function-like macro and use without parentheses didn't trigger replacement). libvo/gl_common.h | 4 ++-- libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit 8ec90e5e4faba5754942c3dbc4edfc9f2b939a6a Author: Uoti Urpala Date: Sat Apr 19 07:04:55 2008 +0300 Add option pointer to vo struct libvo/video_out.c | 8 +++++--- libvo/video_out.h | 3 ++- mplayer.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) commit 5045066574743af40f0c33a76e7df745d967f75a Author: Uoti Urpala Date: Wed Apr 16 06:29:04 2008 +0300 vf.c: malloc+memset -> calloc libmpcodecs/vf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 9b06b5ed85ec28097428e7fe35631ce3a04685b5 Author: Uoti Urpala Date: Wed Apr 16 07:11:12 2008 +0300 Move correct_pts to options struct cfg-mplayer.h | 4 ++-- defaultopts.c | 7 +++++++ defaultopts.h | 1 + libmpcodecs/dec_video.c | 6 ++++-- libmpcodecs/vf_tfields.c | 9 +++++---- libmpcodecs/vf_yadif.c | 7 ++++--- libmpdemux/demux_lavf.c | 4 +++- libmpdemux/demux_mkv.c | 4 +++- libmpdemux/demuxer.c | 9 +++------ libmpdemux/demuxer.h | 3 --- mencoder.c | 4 ++-- mplayer.c | 3 ++- options.h | 2 ++ 13 files changed, 38 insertions(+), 25 deletions(-) commit 0d59f81e546946648dfca93da6b74479d31369bc Author: Uoti Urpala Date: Wed Apr 16 07:06:44 2008 +0300 Add option pointer to vf struct libmpcodecs/vd.c | 9 +++++---- libmpcodecs/ve.c | 4 ++-- libmpcodecs/vf.c | 21 +++++++++++++-------- libmpcodecs/vf.h | 8 +++++--- mencoder.c | 18 +++++++++--------- mplayer.c | 6 +++--- 6 files changed, 37 insertions(+), 29 deletions(-) commit 7039bc090a250f8102ca2c719181dbbc5a74ae79 Author: Uoti Urpala Date: Wed Apr 16 04:23:38 2008 +0300 Add option pointer to demuxers and stheader.h structs libmpdemux/demux_avi.c | 3 +- libmpdemux/demux_mov.c | 3 +- libmpdemux/demux_ogg.c | 3 +- libmpdemux/demux_rtp.cpp | 3 +- libmpdemux/demuxer.c | 63 +++++++++++++++++++++++++++------------------ libmpdemux/demuxer.h | 7 +++- libmpdemux/stheader.h | 4 +++ mencoder.c | 4 +- mplayer.c | 2 +- 9 files changed, 58 insertions(+), 34 deletions(-) commit d3d12332d647d2e9281220b84050518bc3f0cb03 Author: Uoti Urpala Date: Wed Apr 16 05:00:34 2008 +0300 Declare demuxer *_streams fields with proper types Give sh_audio_t, sh_video_t and sh_sub_t which before had typedef names only a matching struct name (without _t) too. Change the a_streams, v_streams and s_streams demuxer fields from void * to struct sh_audio *, struct sh_video * and struct sh_sub *. Remove a now unnecessary cast from mplayer.c. libmpdemux/demuxer.h | 6 +++--- libmpdemux/stheader.h | 6 +++--- mplayer.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) commit 732ee3474ac23a16f0ed7e791c0a5f8160a11ebd Author: Uoti Urpala Date: Tue Apr 1 17:35:10 2008 +0300 Move options "vo" and "ao" to common struct cfg-mplayer.h | 5 +++-- defaultopts.c | 3 +++ mplayer.c | 25 +++++++++++-------------- options.h | 2 ++ 4 files changed, 19 insertions(+), 16 deletions(-) commit 9db0c118d3acee07880472e590dc0a25e5b51be6 Author: Uoti Urpala Date: Mon Mar 31 06:19:29 2008 +0300 Start of new option system First part of option restructuring. The aim is to move option values from a huge number of separate globals to a single non-global struct. This part adds some support for parsing option values into such struct instances, and moves one example option (fixed-vo) to the struct. Makefile | 1 + cfg-mplayer.h | 10 ++++++++-- command.c | 2 +- defaultopts.c | 9 +++++++++ defaultopts.h | 2 ++ m_config.c | 41 ++++++++++++++++++++++++++++++++--------- m_config.h | 4 +++- m_option.h | 18 ++++-------------- mencoder.c | 6 +++++- mp_core.h | 3 ++- mplayer.c | 17 ++++++++++------- options.h | 8 ++++++++ 12 files changed, 85 insertions(+), 36 deletions(-) commit f894294bae1ff9b2c1802a5ae7e73cfdbc26e645 Author: Uoti Urpala Date: Fri Apr 4 09:57:58 2008 +0300 vo_xv: Free resources in error cases If preinit() failed after allocating some resources it didn't free them. Also if preinit() completed but all (if any) calls to config() failed then uninit() it not free resources. Add checks to uninit() to make it safe with only a subset of resources allocated, then make it execute independently of vo_config_count and also make preinit() call it in error cases. libvo/vo_xv.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) commit b91826280c468b1b5b4baf6e0225dfdb878e214a Author: Uoti Urpala Date: Fri Apr 4 09:09:14 2008 +0300 vo_xv.c: Make reconfig logic more robust The previous version was not buggy, but this is easier to see correct. Now it doesn't depend on options determining num_buffers staying constant and on vo_config_count. libvo/vo_xv.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) commit 461264756ec9adbb6fa8294aeacd3fbf50f17c46 Author: Uoti Urpala Date: Fri Apr 4 08:47:12 2008 +0300 vo_xv.c: remove unnecessary #ifdefs and static vars Combine code unnecessarily split in 3 #ifdef blocks into one block and change local variables there were pointlessly declared static to normal ones. After this vo_xv.c no longer defines any global or static variables. libvo/vo_xv.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) commit 1756771e5174360da868103a5d9123015bf7de4a Author: Uoti Urpala Date: Fri Apr 4 08:42:51 2008 +0300 vo_xv.c: Cosmetic changes Remove an unnecessary inner scope in a function and separate 'i' loop counter variable declared in it, reindent. libvo/vo_xv.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) commit ef874e0f4cb4672600b27771aeb263b797bb4c0c Author: Uoti Urpala Date: Fri Apr 4 08:04:11 2008 +0300 Change vo_xv to use new VO API libvo/vo_xv.c | 521 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 283 insertions(+), 238 deletions(-) commit e5e8effca82c24cdf4e15f91cc6fe29893ac0675 Author: Uoti Urpala Date: Fri Apr 4 03:26:33 2008 +0300 Add a context argument to mp_input_add_event_fd callback input/input.c | 6 ++++-- input/input.h | 2 +- libvo/vo_xv.c | 6 ++++-- mplayer.c | 9 ++++++++- 4 files changed, 17 insertions(+), 6 deletions(-) commit 1f086d4376897683194530f7dfc24a42c3eca908 Author: Uoti Urpala Date: Fri Apr 4 02:51:22 2008 +0300 input/input.c: Minor simplification input/input.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) commit 4176d5b183483cef8d4dd480f47923ea138ee7b2 Author: Uoti Urpala Date: Fri Apr 4 03:53:11 2008 +0300 vo_xv.c: Remove #if 0 code libvo/vo_xv.c | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-) commit 8716df2a41f6ff05f59577a0433401ea141226f3 Author: Uoti Urpala Date: Fri Apr 4 06:36:36 2008 +0300 Add context variable to vo_draw_text callback Add a context variable and rename the function to osd_draw_text. Create a new vo_draw_text that is a wrapper for VOs using old API. libmpcodecs/vf_expand.c | 4 ++-- libvo/old_vo_wrapper.c | 16 ++++++++++++++++ libvo/old_vo_wrapper.h | 2 ++ libvo/sub.c | 17 ++++++++++------- libvo/sub.h | 2 +- libvo/vo_directx.c | 1 - libvo/vo_macosx.m | 1 - libvo/vo_quartz.c | 2 -- spudec.c | 6 +++--- spudec.h | 2 +- 10 files changed, 35 insertions(+), 18 deletions(-) commit 2bcfe1e077fe043751d3f7c73c82be761629419f Author: Uoti Urpala Date: Thu Apr 3 06:25:41 2008 +0300 Add new video driver API Create new video driver API that has a per-instance context structure and does not rely on keeping status in global or static variables. Existing drivers are not yet converted to this API; instead there is a wrapper which translates calls to them. In the new API, an old API call vo_functions->xyz(args) is generally replaced by vo_xyz(vo_instance, args). The changes to keep the vesa, dxr2 and xover drivers compiling have not been tested. command.c | 10 ++-- libmenu/vf_menu.c | 4 +- libmpcodecs/vf_vo.c | 44 +++++------- libvo/Makefile | 1 + libvo/old_vo_wrapper.c | 80 +++++++++++++++++++++ libvo/old_vo_wrapper.h | 20 +++++ libvo/vesa_lvo.c | 12 ++-- libvo/vesa_lvo.h | 4 +- libvo/video_out.c | 165 ++++++++++++++++++++++++++++--------------- libvo/video_out.h | 70 ++++++++++++++----- libvo/video_out_internal.h | 19 ++++- libvo/vo_cvidix.c | 2 +- libvo/vo_dxr2.c | 12 ++-- libvo/vo_fbdev.c | 3 +- libvo/vo_svga.c | 2 +- libvo/vo_vesa.c | 3 +- libvo/vo_winvidix.c | 2 +- libvo/vo_xover.c | 41 ++++++----- libvo/vo_xvidix.c | 2 +- libvo/vosub_vidix.c | 15 ++-- libvo/vosub_vidix.h | 6 +- mencoder.c | 15 +++-- mp_core.h | 2 +- mplayer.c | 19 +++-- spudec.c | 10 ++-- spudec.h | 2 +- 26 files changed, 387 insertions(+), 178 deletions(-) commit 3bb140d847eb214cf71256794170d72616edbaf4 Author: Uoti Urpala Date: Thu Apr 3 04:58:32 2008 +0300 video_out.c: Cosmetic changes Reformat some code, rename local variable, remove trailing whitespace. libvo/video_out.c | 123 +++++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 60 deletions(-) commit de56d2d9f5b3c5b11c73fba0d01323197d009e04 Author: Uoti Urpala Date: Wed Apr 2 19:38:34 2008 +0300 Remove variable arguments from vo control() functions No voctrl uses them any more, and using them would not be a good idea because it makes forwarding arguments to other functions harder. libvo/mga_common.c | 2 +- libvo/vesa_lvo.c | 4 ++-- libvo/video_out.h | 2 +- libvo/video_out_internal.h | 2 +- libvo/vo_3dfx.c | 2 +- libvo/vo_aa.c | 2 +- libvo/vo_bl.c | 2 +- libvo/vo_caca.c | 2 +- libvo/vo_cvidix.c | 2 +- libvo/vo_dfbmga.c | 2 +- libvo/vo_dga.c | 2 +- libvo/vo_directfb2.c | 2 +- libvo/vo_directx.c | 2 +- libvo/vo_dxr2.c | 2 +- libvo/vo_dxr3.c | 2 +- libvo/vo_fbdev.c | 2 +- libvo/vo_fbdev2.c | 2 +- libvo/vo_ggi.c | 2 +- libvo/vo_gif89a.c | 2 +- libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- libvo/vo_ivtv.c | 2 +- libvo/vo_jpeg.c | 2 +- libvo/vo_md5sum.c | 2 +- libvo/vo_mpegpes.c | 2 +- libvo/vo_null.c | 2 +- libvo/vo_png.c | 2 +- libvo/vo_pnm.c | 2 +- libvo/vo_quartz.c | 2 +- libvo/vo_s3fb.c | 2 +- libvo/vo_sdl.c | 2 +- libvo/vo_svga.c | 2 +- libvo/vo_tdfx_vid.c | 2 +- libvo/vo_tdfxfb.c | 2 +- libvo/vo_tga.c | 2 +- libvo/vo_v4l2.c | 2 +- libvo/vo_vesa.c | 2 +- libvo/vo_winvidix.c | 2 +- libvo/vo_x11.c | 2 +- libvo/vo_xover.c | 3 +-- libvo/vo_xv.c | 2 +- libvo/vo_xvidix.c | 2 +- libvo/vo_xvmc.c | 2 +- libvo/vo_xvr100.c | 2 +- libvo/vo_yuv4mpeg.c | 2 +- libvo/vo_zr.c | 2 +- libvo/vo_zr2.c | 2 +- libvo/vosub_vidix.c | 2 +- libvo/vosub_vidix.h | 2 +- 49 files changed, 50 insertions(+), 51 deletions(-) commit dbe080ec9f05cd216f4217c81409a37d3f4db969 Author: Uoti Urpala Date: Wed Apr 2 18:51:38 2008 +0300 Change VOCTRL_[GET|SET]_EQUALIZER argument passing These were the only voctrl types with more than one argument. The second argument was passed using variable arguments. Change them to use a single argument (address of a struct containing both old arguments). This makes forwarding the arguments to other functions easier and allows simplifying code. libmpcodecs/vf_vo.c | 6 ++- libvo/mga_common.c | 25 ++++++---------- libvo/video_out.h | 8 +++++ libvo/vo_aa.c | 31 ++++++-------------- libvo/vo_cvidix.c | 18 ------------ libvo/vo_dfbmga.c | 20 ++---------- libvo/vo_directfb2.c | 20 ++---------- libvo/vo_directx.c | 18 ++--------- libvo/vo_dxr3.c | 38 +++++++++---------------- libvo/vo_fbdev.c | 21 +------------- libvo/vo_gl.c | 76 ++++++++++++++++++++++--------------------------- libvo/vo_gl2.c | 18 ++--------- libvo/vo_svga.c | 27 +----------------- libvo/vo_vesa.c | 27 +----------------- libvo/vo_winvidix.c | 22 -------------- libvo/vo_x11.c | 20 ++---------- libvo/vo_xv.c | 22 ++------------ libvo/vo_xvidix.c | 24 ---------------- libvo/vo_xvmc.c | 20 ++---------- libvo/vosub_vidix.c | 47 ++++++++++++------------------ 20 files changed, 130 insertions(+), 378 deletions(-)