commit e7dab449f1dc751703d2e408453e326bd3d46f7a Author: Kovensky Date: Sun Jul 19 09:37:25 2009 -0300 Workaround bug in msvcrt: -identify always printed ID_LENGTH=0.00 mplayer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit defe72c201ef75ebd6e80661f3171057d0299a3d Merge: 223b35a c688394 Author: Kovensky Date: Mon Jul 13 15:47:07 2009 -0300 Merge commit 'greg/libass' into mt commit 223b35a416203b9ee770345d5fb5ef1290c5e822 Author: Kovensky Date: Mon Jul 13 15:42:56 2009 -0300 Updated ffmpeg/libass. ffmpeg | 2 +- libass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 116681f6e2698d8060607db531b73df6e510927e Author: Kovensky Date: Mon Jul 13 15:41:24 2009 -0300 Add -fno-common to CFLAGS Caused crashes on unaligned memory accesses. config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit af3da3381208c3e14a996fb46535bc3f883bdfb3 Merge: 4797cb6 b339975 Author: Kovensky Date: Mon Jul 13 13:23:25 2009 -0300 Merge branch 'mt' of git://repo.or.cz/mplayer into mt Conflicts: ffmpeg libass commit b3399753bc5db4d55824a0001fb48089adc758ce Author: Uoti Urpala Date: Fri Jul 10 22:25:49 2009 +0300 Update FFmpeg-mt submodule Should fix recently introduced FFmpeg-mt error which caused crashes when NOT using more than one thread. ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit fe5db88fff6c773388bc60623555f389767d9b40 Merge: 1eac58a bb6c06d Author: Uoti Urpala Date: Fri Jul 10 23:00:34 2009 +0300 Merge branch 'master' into mt commit bb6c06d17f661ff99edb0eb1dc9c0a12770f887f Author: Uoti Urpala Date: Fri Jul 10 19:53:26 2009 +0300 demux_mkv.c: Make some time arithmetic more precise Some calculations in the demuxer that are in principle integer arithmetic use float divisions instead of 64-bit integer ones (as in (int64_t)(x / 1000000.0) ). When compiled with -ffast-math gcc replaces the division with multiplication by inverse. The calculation of the inverse can introduce rounding error even for divisions that would have been exact, and any rounding error down from an exact integer result in the division makes the result after cast one smaller. This caused some inaccuracy in seeking due to timecodes in the index not quite matching those calculated for actual packets. Add 0.5 to such expressions before casting to round instead of truncating, which should be enough to avoid the problem. Also replace some non-performance-critical use of float types by doubles. libmpdemux/demux_mkv.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) commit 1eac58ac0f1205b47a4c51cf5ad5c5a1d9fcc1ff Merge: 0e62713 3f75062 Author: Uoti Urpala Date: Thu Jul 9 18:42:41 2009 +0300 Merge branch 'master' into mt commit 3f75062ca65cea46fa9e06ab5f5271ad310440fd Author: Uoti Urpala Date: Thu Jul 9 18:23:35 2009 +0300 demux_mkv: Round more seeks to "backwards" keyframes Allow more fuzziness in treating timestamps as inaccurate attempts to seek "exactly" to a keyframe. A seek forward can now actually go to a keyframe 5 ms back from the timecode, and correspondingly for seeks backwards. Before only 1 ms was allowed. This helps with some files that have inaccurate chapter boundaries. libmpdemux/demux_mkv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d9977e1c818d589e83e8dc2f0da84ad2e4960d86 Author: Uoti Urpala Date: Thu Jul 9 18:13:49 2009 +0300 demux_mkv: Make seeks more precise in some cases When seeking backward, after seeking to the file position specified by an index entry skip packets until the timecode of that index entry. The existence of the entry should guarantee a keyframe there before the seek target time. libmpdemux/demux_mkv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit c68839410b72d6c997452d91d70b9caf635e163b Author: Grigori Goronzy Date: Mon Jun 29 18:55:12 2009 +0200 Pass physical aspect ratio to libass Do not assume 1:1 PAR and calculate aspect ratio via width / height, instead directly pass the physical aspect ratio to libass. libmpcodecs/vf_vo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cad335b6d44b51665edc4fc2a96de6b2b9a0ef45 Author: Grigori Goronzy Date: Mon Jun 29 17:20:39 2009 +0200 process_force_style renamed, API change. process_force_style was renamed to ass_process_force_style in libass and is now exposed in ass.h ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 60d185f68651cc9c3c783774c8ef4263254f0da8 Author: Grigori Goronzy Date: Mon Jun 29 17:19:18 2009 +0200 Pass original size of the decoded video to libass. libmpcodecs/vf_ass.c | 3 ++- libmpcodecs/vf_vo.c | 2 +- libvo/video_out.h | 1 + libvo/vo_gl.c | 2 ++ libvo/vo_vdpau.c | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) commit f0d5f4592e1381d20ce67859fd6940141b508536 Author: greg Date: Fri Jun 19 06:04:06 2009 +0200 ass_set_fonts: another API change. ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ade8004ded6578cecf94d9702b1831da26933cad Author: greg Date: Fri Jun 19 05:41:20 2009 +0200 ass_set_fonts: API changed ass_mp.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit 4d8244c8b11ca2cfdd662162bf0e0f15b8395782 Author: greg Date: Thu Jun 18 15:22:43 2009 +0200 Wrap stuff in CONFIG_ASS, making MPlayer compile without ASS support. libmpcodecs/vf_ass.c | 2 ++ libmpdemux/demux_mkv.c | 2 ++ libvo/vo_gl.c | 18 ++++++++++++++++-- libvo/vo_vdpau.c | 23 ++++++++++++++++++++++- 4 files changed, 42 insertions(+), 3 deletions(-) commit 90cea3a03315e837565146d2f012a81f5d0e8ecb Author: greg Date: Thu Jun 18 15:01:27 2009 +0200 Fix setting _ass variable in configure to correctly report whether libass support is enabled. configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit dcd28376128466e48f28cfe03ada32f1095b17fa Author: greg Date: Thu Jun 18 14:55:02 2009 +0200 Move ass_mp helpers into root; delete libass directory. Makefile | 2 +- ass_mp.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++++ ass_mp.h | 60 +++++++++++ command.c | 2 +- libass/ass_mp.c | 278 ------------------------------------------------ libass/ass_mp.h | 60 ----------- libmpcodecs/vf_ass.c | 2 +- libmpcodecs/vf_vo.c | 2 +- libmpdemux/demux_mkv.c | 2 +- libmpdemux/demuxer.c | 2 +- libvo/vo_gl.c | 2 +- libvo/vo_vdpau.c | 2 +- mencoder.c | 2 +- mpcommon.c | 2 +- mplayer.c | 2 +- 15 files changed, 349 insertions(+), 349 deletions(-) commit 1b6685e0ead05678c8b77f7cd101e250c9a7167a Author: greg Date: Thu Jun 18 14:45:21 2009 +0200 Remove remaining libass/ass.h includes. libvo/vo_vdpau.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 797b80594f1a01d2e152903f0421606452f82e57 Author: greg Date: Wed Jun 17 22:33:36 2009 +0200 Support for standalone libass, dynamically linked. Makefile | 12 +- command.c | 1 - configure | 32 +- libass/ass.c | 1134 ------------------- libass/ass.h | 229 ---- libass/ass_bitmap.c | 336 ------ libass/ass_bitmap.h | 53 - libass/ass_cache.c | 385 ------- libass/ass_cache.h | 98 -- libass/ass_cache_template.c | 88 -- libass/ass_font.c | 371 ------ libass/ass_font.h | 60 - libass/ass_fontconfig.c | 516 --------- libass/ass_fontconfig.h | 41 - libass/ass_library.c | 115 -- libass/ass_library.h | 41 - libass/ass_mp.c | 7 +- libass/ass_mp.h | 4 +- libass/ass_render.c | 2616 ------------------------------------------- libass/ass_types.h | 119 -- libass/ass_utils.c | 135 --- libass/ass_utils.h | 66 -- libass/mputils.h | 31 - libmpcodecs/vf_ass.c | 1 - libmpcodecs/vf_vo.c | 1 - libmpdemux/demux_mkv.c | 1 - libmpdemux/demuxer.c | 1 - libvo/vo_gl.c | 1 - mencoder.c | 1 - mpcommon.c | 1 - mplayer.c | 1 - 31 files changed, 16 insertions(+), 6482 deletions(-) commit 4797cb624e552d055008671f86bd309246caa928 Author: Kovensky Date: Wed Jul 8 09:26:57 2009 -0300 10l: bad merge. Also, revert making libmpeg2 default. It was even more problematic than ffmpeg2. etc/codecs.conf | 68 ++++++++++++++---------------------------------------- 1 files changed, 18 insertions(+), 50 deletions(-) commit 3c3109dec1467808d8635725e149d217fbfc588c Author: Kovensky Date: Wed Jul 8 09:23:56 2009 -0300 10l: didn't properly merge one line configure | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 10baf752ffbad65723b94766881ed06ffda4b283 Merge: 321cc5a 0e62713 Author: Kovensky Date: Wed Jul 8 09:21:30 2009 -0300 Merge branch 'mt' of git://repo.or.cz/mplayer into mt Conflicts: cfg-mplayer-def.h configure etc/codecs.conf ffmpeg gui/cfg.c gui/interface.c input/input.c libaf/af_equalizer.c libass libass/ass.c libass/ass.h libass/ass_bitmap.c libass/ass_cache.c libass/ass_cache.h libass/ass_font.c libass/ass_fontconfig.c libass/ass_library.c libass/ass_render.c libass/ass_types.h libass/ass_utils.c libmpcodecs/ad_faad.c libmpdemux/mp_taglists.c libvo/vo_directx.c libvo/vo_gl.c libvo/w32_common.c mplayer.c osdep/mplayer.rc commit 321cc5a3080067f21f589e149a8d2234fd68ba2e Author: Kovensky Date: Wed Jul 8 09:10:42 2009 -0300 Updated ffmpeg/libass ffmpeg | 2 +- libass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4a1feb7398d4801958240160bc6220c488d9b6d9 Author: Kovensky Date: Wed Jul 8 09:04:57 2009 -0300 Add libass.txt to the list of changelogs to pack pack.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ce4b89431bd3c4ec446d48df257ba5ea684bd4c5 Author: Kovensky Date: Wed Jul 8 09:04:42 2009 -0300 API compatibility hack libmpdemux/mp_taglists.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit c94026b20134d0131b368477a9e7a19ba1da6e18 Author: Kovensky Date: Wed Jul 8 09:03:06 2009 -0300 Don't print the FAAD assuming 128kbit/s message. It doesn't affect playback and only confuses people. libmpcodecs/ad_faad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 84fc3d2929220464f817cc78688341be71a4b5cd Author: Kovensky Date: Wed Jul 8 09:02:38 2009 -0300 Remove some unnecesary CFLAGS config.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 0e6271361c09f822846444b6b811889c44ce1a77 Author: Uoti Urpala Date: Tue Jul 7 22:12:40 2009 +0300 Update FFmpeg-mt submodule ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ed71c28e26580bb1e627fce5e316c647e22bbb0e Merge: 2c7bb6e 8736669 Author: Uoti Urpala Date: Tue Jul 7 22:12:01 2009 +0300 Merge branch 'master' into mt commit 87366694d82c8d4c7f0bc210e6baa0ccd651d0c2 Author: Anton Khirnov Date: Tue Jul 7 19:35:54 2009 +0200 Remove the internal GUI The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it. DOCS/man/en/mplayer.1 | 73 +-- DOCS/tech/MAINTAINERS | 2 - DOCS/tech/binary-packaging.txt | 22 +- DOCS/xml/en/documentation.xml | 1 - DOCS/xml/en/faq.xml | 6 +- DOCS/xml/en/install.xml | 29 +- DOCS/xml/en/skin.xml | 1200 -------------------- Makefile | 60 +- README | 51 +- cfg-common.h | 2 - cfg-mplayer.h | 16 +- command.c | 24 - configure | 151 +--- etc/input.conf | 12 - gui/app.c | 239 ---- gui/app.h | 204 ---- gui/bitmap.c | 185 ---- gui/bitmap.h | 34 - gui/cfg.c | 371 ------- gui/cfg.h | 79 -- gui/interface.c | 1313 ---------------------- gui/interface.h | 240 ---- gui/mplayer/gmplayer.h | 51 - gui/mplayer/gtk/about.c | 346 ------ gui/mplayer/gtk/about.h | 29 - gui/mplayer/gtk/eq.c | 690 ------------ gui/mplayer/gtk/eq.h | 29 - gui/mplayer/gtk/fs.c | 656 ----------- gui/mplayer/gtk/fs.h | 39 - gui/mplayer/gtk/gtk_common.c | 197 ---- gui/mplayer/gtk/gtk_common.h | 41 - gui/mplayer/gtk/gtk_url.c | 170 --- gui/mplayer/gtk/gtk_url.h | 30 - gui/mplayer/gtk/mb.c | 114 -- gui/mplayer/gtk/mb.h | 29 - gui/mplayer/gtk/menu.c | 645 ----------- gui/mplayer/gtk/menu.h | 31 - gui/mplayer/gtk/opts.c | 1832 ------------------------------- gui/mplayer/gtk/opts.h | 33 - gui/mplayer/gtk/pl.c | 545 --------- gui/mplayer/gtk/pl.h | 29 - gui/mplayer/gtk/sb.c | 211 ---- gui/mplayer/gtk/sb.h | 30 - gui/mplayer/gui_common.c | 308 ------ gui/mplayer/gui_common.h | 37 - gui/mplayer/menu.c | 175 --- gui/mplayer/mw.c | 636 ----------- gui/mplayer/pb.c | 265 ----- gui/mplayer/pixmaps/MPlayer_mini.xpm | 638 ----------- gui/mplayer/pixmaps/a11.xpm | 22 - gui/mplayer/pixmaps/a169.xpm | 22 - gui/mplayer/pixmaps/a235.xpm | 22 - gui/mplayer/pixmaps/a43.xpm | 22 - gui/mplayer/pixmaps/ab.xpm | 34 - gui/mplayer/pixmaps/about.xpm | 427 ------- gui/mplayer/pixmaps/aspect.xpm | 22 - gui/mplayer/pixmaps/cancel.xpm | 139 --- gui/mplayer/pixmaps/chapter.xpm | 23 - gui/mplayer/pixmaps/delsub.xpm | 22 - gui/mplayer/pixmaps/dir.xpm | 148 --- gui/mplayer/pixmaps/dolby.xpm | 23 - gui/mplayer/pixmaps/double.xpm | 151 --- gui/mplayer/pixmaps/dvd.xpm | 129 --- gui/mplayer/pixmaps/empty.xpm | 20 - gui/mplayer/pixmaps/empty1px.xpm | 5 - gui/mplayer/pixmaps/eq.xpm | 35 - gui/mplayer/pixmaps/error.xpm | 544 --------- gui/mplayer/pixmaps/exit.xpm | 82 -- gui/mplayer/pixmaps/file.xpm | 26 - gui/mplayer/pixmaps/file2.xpm | 27 - gui/mplayer/pixmaps/fs.xpm | 109 -- gui/mplayer/pixmaps/half.xpm | 144 --- gui/mplayer/pixmaps/icon.xpm | 323 ------ gui/mplayer/pixmaps/loadeaf.xpm | 151 --- gui/mplayer/pixmaps/logo.xpm | 1227 --------------------- gui/mplayer/pixmaps/mplayer-desktop.xpm | 149 --- gui/mplayer/pixmaps/next.xpm | 79 -- gui/mplayer/pixmaps/normal.xpm | 130 --- gui/mplayer/pixmaps/ok.xpm | 24 - gui/mplayer/pixmaps/open.xpm | 83 -- gui/mplayer/pixmaps/pause.xpm | 48 - gui/mplayer/pixmaps/pl.xpm | 26 - gui/mplayer/pixmaps/play.xpm | 56 - gui/mplayer/pixmaps/playdvd.xpm | 137 --- gui/mplayer/pixmaps/playvcd.xpm | 201 ---- gui/mplayer/pixmaps/prefs.xpm | 69 -- gui/mplayer/pixmaps/prev.xpm | 77 -- gui/mplayer/pixmaps/question.xpm | 335 ------ gui/mplayer/pixmaps/skin.xpm | 181 --- gui/mplayer/pixmaps/sound.xpm | 140 --- gui/mplayer/pixmaps/stop.xpm | 254 ----- gui/mplayer/pixmaps/stop2.xpm | 48 - gui/mplayer/pixmaps/sub.xpm | 21 - gui/mplayer/pixmaps/title.xpm | 23 - gui/mplayer/pixmaps/tongue.xpm | 169 --- gui/mplayer/pixmaps/tonguebla.xpm | 156 --- gui/mplayer/pixmaps/up.xpm | 112 -- gui/mplayer/pixmaps/url.xpm | 21 - gui/mplayer/pixmaps/vcd.xpm | 179 --- gui/mplayer/pixmaps/warning.xpm | 314 ------ gui/mplayer/play.c | 387 ------- gui/mplayer/play.h | 51 - gui/mplayer/sw.c | 110 -- gui/mplayer/widgets.c | 255 ----- gui/mplayer/widgets.h | 80 -- gui/skin/cut.c | 52 - gui/skin/cut.h | 27 - gui/skin/font.c | 269 ----- gui/skin/font.h | 54 - gui/skin/skin.c | 745 ------------- gui/skin/skin.h | 35 - gui/win32/Changelog | 317 ------ gui/win32/README | 21 - gui/win32/dialogs.c | 1122 ------------------- gui/win32/dialogs.h | 134 --- gui/win32/gui.c | 1549 -------------------------- gui/win32/gui.h | 121 -- gui/win32/interface.c | 948 ---------------- gui/win32/playlist.c | 158 --- gui/win32/playlist.h | 61 - gui/win32/preferences.c | 714 ------------ gui/win32/skinload.c | 776 ------------- gui/win32/skinload.h | 215 ---- gui/win32/widgetrender.c | 354 ------ gui/win32/wincfg.c | 147 --- gui/wm/ws.c | 1311 ---------------------- gui/wm/ws.h | 275 ----- gui/wm/wskeys.h | 181 --- gui/wm/wsmkeys.h | 86 -- gui/wm/wsxdnd.c | 259 ----- gui/wm/wsxdnd.h | 71 -- input/input.c | 34 +- input/input.h | 14 +- libvo/mga_common.c | 5 - libvo/video_out.h | 4 - libvo/vo_dfbmga.c | 4 - libvo/vo_direct3d.c | 2 - libvo/vo_directx.c | 9 - libvo/vo_dxr3.c | 35 - libvo/vo_gl.c | 14 - libvo/vo_gl2.c | 21 - libvo/vo_vdpau.c | 10 +- libvo/vo_x11.c | 12 - libvo/vo_xmga.c | 11 +- libvo/vo_xover.c | 16 - libvo/vo_xv.c | 11 - libvo/vo_xvidix.c | 18 - libvo/vo_xvmc.c | 8 - libvo/x11_common.c | 37 - mp_core.h | 2 +- mp_msg.c | 13 - mp_msg.h | 1 - mpcommon.c | 9 - mplayer.c | 273 +----- mplayer.h | 2 - playtree.c | 14 - playtree.h | 7 +- stream/cache2.c | 4 - 158 files changed, 42 insertions(+), 30514 deletions(-) commit a2037a2effbd4622d0e8336245a9b14c3f886bde Merge: 0c2773a 43079c5 Author: Uoti Urpala Date: Tue Jul 7 02:56:01 2009 +0300 Merge svn changes up to r29412 commit 43079c51daa8c12b0a44e5ad8022c979dd9e8336 Author: Uoti Urpala Date: Tue Jul 7 02:47:09 2009 +0300 Revert "fix missing event on move that breaks xmga window movement" The reverted commit had a harmful effect on other VOs as it produced bogus events that caused unnecessary load and flicker at least when moving the window while paused. A proper fix would need a separate event type. So revert this commit before merging the changes to the master branch; it'll leave xmga window movement broken, but I consider that less important than the other VOs. libvo/x11_common.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 0c2773a709276681575d2507aa60ee85c2d0b850 Merge: 0eb321b 6e9cbdc Author: Uoti Urpala Date: Tue Jul 7 02:35:18 2009 +0300 Merge svn r29305 (trailing whitespace removal) This merge doesn't actually modify the tree, it's only here to tell git that later merges should not try to apply the whitespace changes (which would produce lots of conflicts). commit 0eb321bf2c1cc0e048faff26a01f86cdd3ec254f Author: Uoti Urpala Date: Tue Jul 7 02:26:13 2009 +0300 Remove trailing whitespace from most files DOCS/README | 6 +- DOCS/man/cs/mplayer.1 | 4 +- DOCS/man/en/mplayer.1 | 2 +- DOCS/man/es/mplayer.1 | 10 +- DOCS/man/it/mplayer.1 | 26 +- DOCS/man/pl/mplayer.1 | 12 +- DOCS/man/ru/mplayer.1 | 4 +- DOCS/man/zh_CN/mplayer.1 | 234 +- DOCS/tech/Doxyfile | 918 +- DOCS/tech/TODO | 2 +- DOCS/tech/codec-devel.txt | 6 +- DOCS/tech/dr-methods.txt | 2 +- DOCS/tech/encoding-tips.txt | 128 +- DOCS/tech/formats.txt | 26 +- DOCS/tech/general.txt | 7 +- DOCS/tech/hwac3.txt | 98 +- DOCS/tech/libao2.txt | 4 +- DOCS/tech/libvo.txt | 7 +- DOCS/tech/mingw-crosscompile.txt | 2 +- DOCS/tech/new_policy_proposal.txt | 6 +- DOCS/tech/playtree | 8 +- DOCS/tech/realcodecs/TODO | 2 - DOCS/tech/realcodecs/audio-codecs.txt | 7 +- DOCS/tech/realcodecs/video-codecs.txt | 8 +- DOCS/tech/slave.txt | 5 +- DOCS/tech/snow.txt | 3 +- DOCS/tech/subcp.txt | 14 +- DOCS/tech/swscaler_methods.txt | 9 +- DOCS/tech/vidix.txt | 20 +- DOCS/xml/configure | 2 +- DOCS/xml/cs/documentation.xml | 6 +- DOCS/xml/cs/encoding-guide.xml | 22 +- DOCS/xml/cs/install.xml | 2 +- DOCS/xml/cs/mencoder.xml | 4 +- DOCS/xml/cs/ports.xml | 2 +- DOCS/xml/cs/skin.xml | 4 +- DOCS/xml/cs/video.xml | 2 +- DOCS/xml/de/cd-dvd.xml | 2 +- DOCS/xml/de/documentation.xml | 2 +- DOCS/xml/en/documentation.xml | 2 +- DOCS/xml/en/skin.xml | 6 +- DOCS/xml/es/bugreports.xml | 4 +- DOCS/xml/es/cd-dvd.xml | 10 +- DOCS/xml/es/documentation.xml | 10 +- DOCS/xml/es/faq.xml | 8 +- DOCS/xml/es/install.xml | 38 +- DOCS/xml/es/mencoder.xml | 20 +- DOCS/xml/es/ports.xml | 12 +- DOCS/xml/es/skin.xml | 8 +- DOCS/xml/es/tvinput.xml | 14 +- DOCS/xml/es/usage.xml | 16 +- DOCS/xml/es/video.xml | 36 +- DOCS/xml/fr/documentation.xml | 2 +- DOCS/xml/fr/encoding-guide.xml | 68 +- DOCS/xml/fr/install.xml | 18 +- DOCS/xml/fr/mencoder.xml | 6 +- DOCS/xml/fr/ports.xml | 2 +- DOCS/xml/fr/radio.xml | 6 +- DOCS/xml/fr/tvinput.xml | 2 +- DOCS/xml/fr/video.xml | 16 +- DOCS/xml/html-common.xsl | 4 +- DOCS/xml/hu/documentation.xml | 2 +- DOCS/xml/it/documentation.xml | 2 +- DOCS/xml/it/encoding-guide.xml | 44 +- DOCS/xml/it/faq.xml | 6 +- DOCS/xml/it/install.xml | 8 +- DOCS/xml/it/mencoder.xml | 2 +- DOCS/xml/it/tvinput.xml | 6 +- DOCS/xml/it/video.xml | 12 +- DOCS/xml/ldp.dsl | 15 +- DOCS/xml/pl/bugreports.xml | 4 +- DOCS/xml/pl/cd-dvd.xml | 16 +- DOCS/xml/pl/documentation.xml | 2 +- DOCS/xml/pl/encoding-guide.xml | 50 +- DOCS/xml/pl/faq.xml | 4 +- DOCS/xml/pl/install.xml | 4 +- DOCS/xml/pl/mencoder.xml | 6 +- DOCS/xml/pl/ports.xml | 6 +- DOCS/xml/pl/skin.xml | 20 +- DOCS/xml/pl/usage.xml | 64 +- DOCS/xml/pl/video.xml | 8 +- DOCS/xml/ru/documentation.xml | 2 +- DOCS/xml/ru/install.xml | 60 +- DOCS/xml/ru/mencoder.xml | 88 +- DOCS/xml/ru/ports.xml | 116 +- DOCS/xml/ru/radio.xml | 30 +- DOCS/xml/ru/skin.xml | 156 +- DOCS/xml/ru/tvinput.xml | 12 +- DOCS/xml/ru/usage.xml | 108 +- DOCS/xml/ru/video.xml | 412 +- DOCS/xml/xsl/ldp-html-chunk.xsl | 2 +- DOCS/xml/xsl/ldp-html-common.xsl | 22 +- DOCS/xml/xsl/ldp-html.xsl | 2 +- DOCS/xml/zh_CN/documentation.xml | 2 +- DOCS/xml/zh_CN/mencoder.xml | 6 +- DOCS/xml/zh_CN/radio.xml | 4 +- TOOLS/aconvert.sh | 2 +- TOOLS/asfinfo.c | 1 - TOOLS/avisubdump.c | 1 - TOOLS/bmovl-test.c | 8 +- TOOLS/calcbpp.pl | 2 +- TOOLS/compare.c | 1 - TOOLS/divx2svcd.sh | 2 +- TOOLS/mencvcd.sh | 18 +- TOOLS/modify_reg.c | 3 +- TOOLS/movinfo.c | 28 +- TOOLS/netstream.c | 14 +- TOOLS/plotpsnr.pl | 2 +- TOOLS/qepdvcd.sh | 12 +- TOOLS/realcodecs/14_4.c | 10 +- TOOLS/realcodecs/28_8.c | 10 +- TOOLS/realcodecs/cook.c | 11 +- TOOLS/realcodecs/drv2.c | 34 +- TOOLS/realcodecs/drv3.c | 24 +- TOOLS/realcodecs/drv4.c | 25 +- TOOLS/realcodecs/ra.c | 7 +- TOOLS/realcodecs/rv30.c | 5 +- TOOLS/realcodecs/sipr.c | 11 +- TOOLS/subrip.c | 2 +- TOOLS/vivodump.c | 10 +- TOOLS/vobshift.py | 6 +- TOOLS/w32codec_dl.pl | 17 +- asxparser.c | 40 +- cfg-common-opts.h | 16 +- cfg-common.h | 2 +- cfg-mencoder.h | 10 +- cfg-mplayer-def.h | 1 - cfg-mplayer.h | 17 +- codec-cfg.c | 56 +- command.c | 2 +- cpudetect.c | 26 +- debian/README.debian | 2 +- debian/changelog | 16 +- debian/control | 2 +- debian/rules | 6 +- drivers/3dfx.h | 6 +- drivers/hacking.ati | 4 +- drivers/mga_vid.c | 224 +- drivers/mga_vid_test.c | 34 +- drivers/radeon.h | 2 +- drivers/radeon_vid.c | 57 +- drivers/tdfx_vid.c | 60 +- drivers/tdfx_vid.h | 2 +- drivers/tdfx_vid_test.c | 14 +- edl.c | 20 +- etc/codecs.conf | 4 +- etc/input.conf | 4 +- etc/menu.conf | 4 +- find_sub.c | 20 +- gui/app.c | 6 +- gui/app.h | 4 +- gui/bitmap.c | 10 +- gui/cfg.c | 19 +- gui/interface.c | 94 +- gui/interface.h | 6 +- gui/mplayer/gtk/about.c | 30 +- gui/mplayer/gtk/eq.c | 45 +- gui/mplayer/gtk/gtk_common.c | 2 +- gui/mplayer/gtk/gtk_url.c | 17 +- gui/mplayer/gtk/mb.c | 8 +- gui/mplayer/gtk/menu.c | 24 +- gui/mplayer/gtk/opts.c | 94 +- gui/mplayer/gtk/pl.c | 17 +- gui/mplayer/gtk/sb.c | 2 +- gui/mplayer/gui_common.c | 10 +- gui/mplayer/mw.c | 32 +- gui/mplayer/pb.c | 28 +- gui/mplayer/play.c | 24 +- gui/mplayer/sw.c | 2 +- gui/mplayer/widgets.c | 20 +- gui/skin/cut.c | 5 +- gui/skin/font.c | 30 +- gui/skin/skin.c | 26 +- gui/wm/ws.c | 16 +- gui/wm/wsxdnd.c | 18 +- help/help_mp-bg.h | 4 +- help/help_mp-cs.h | 4 +- help/help_mp-dk.h | 6 +- help/help_mp-es.h | 19 +- help/help_mp-fr.h | 6 +- help/help_mp-hu.h | 13 +- help/help_mp-it.h | 18 +- help/help_mp-ko.h | 6 +- help/help_mp-nl.h | 4 +- help/help_mp-pl.h | 7 +- help/help_mp-ro.h | 2 +- help/help_mp-sk.h | 7 +- help/help_mp-sv.h | 13 +- help/help_mp-tr.h | 14 +- help/help_mp-uk.h | 7 +- help/help_mp-zh_CN.h | 10 +- help/help_mp-zh_TW.h | 4 +- input/appleir.c | 6 +- input/input.c | 42 +- input/input.h | 4 +- input/joystick.c | 22 +- input/lirc.c | 4 +- input/lirc.h | 2 +- libaf/af.c | 86 +- libaf/af.h | 18 +- libaf/af_center.c | 8 +- libaf/af_channels.c | 34 +- libaf/af_comp.c | 24 +- libaf/af_delay.c | 12 +- libaf/af_dummy.c | 2 +- libaf/af_equalizer.c | 47 +- libaf/af_export.c | 46 +- libaf/af_extrastereo.c | 18 +- libaf/af_format.c | 40 +- libaf/af_format_alaw.h | 388 +- libaf/af_format_ulaw.h | 1414 +- libaf/af_gate.c | 20 +- libaf/af_hrtf.c | 18 +- libaf/af_karaoke.c | 16 +- libaf/af_ladspa.c | 14 +- libaf/af_lavcresample.c | 18 +- libaf/af_pan.c | 14 +- libaf/af_resample.c | 75 +- libaf/af_resample_template.c | 28 +- libaf/af_sinesuppress.c | 16 +- libaf/af_sub.c | 12 +- libaf/af_surround.c | 10 +- libaf/af_sweep.c | 7 +- libaf/af_tools.c | 22 +- libaf/af_volnorm.c | 64 +- libaf/af_volume.c | 32 +- libaf/control.h | 36 +- libaf/equalizer.h | 4 +- libaf/filter.c | 61 +- libaf/filter.h | 4 +- libaf/format.c | 24 +- libaf/reorder_ch.c | 1 - libaf/window.c | 27 +- libao2/ao_alsa.c | 48 +- libao2/ao_alsa5.c | 16 +- libao2/ao_arts.c | 1 - libao2/ao_coreaudio.c | 28 +- libao2/ao_dsound.c | 74 +- libao2/ao_dxr2.c | 9 +- libao2/ao_esd.c | 24 +- libao2/ao_ivtv.c | 10 +- libao2/ao_jack.c | 3 +- libao2/ao_mpegpes.c | 4 +- libao2/ao_nas.c | 12 +- libao2/ao_null.c | 6 +- libao2/ao_openal.c | 3 +- libao2/ao_oss.c | 18 +- libao2/ao_pcm.c | 22 +- libao2/ao_sdl.c | 28 +- libao2/ao_sgi.c | 68 +- libao2/ao_sun.c | 25 +- libao2/ao_v4l2.c | 10 +- libao2/ao_win32.c | 2 +- libao2/audio_out.c | 1 - libao2/audio_out.h | 4 +- libass/ass.c | 89 +- libass/ass.h | 2 +- libass/ass_bitmap.c | 5 +- libass/ass_cache.c | 7 +- libass/ass_cache.h | 2 +- libass/ass_font.c | 18 +- libass/ass_fontconfig.c | 32 +- libass/ass_library.c | 12 +- libass/ass_mp.c | 2 +- libass/ass_render.c | 109 +- libass/ass_types.h | 4 +- libass/ass_utils.c | 10 +- libmenu/menu.c | 28 +- libmenu/menu.h | 4 +- libmenu/menu_chapsel.c | 4 +- libmenu/menu_cmdlist.c | 4 +- libmenu/menu_console.c | 20 +- libmenu/menu_dvbin.c | 32 +- libmenu/menu_filesel.c | 14 +- libmenu/menu_list.c | 13 +- libmenu/menu_list.h | 2 +- libmenu/menu_param.c | 10 +- libmenu/menu_pt.c | 6 +- libmenu/menu_txt.c | 6 +- libmenu/vf_menu.c | 9 +- libmpcodecs/ad_acm.c | 18 +- libmpcodecs/ad_dk3adpcm.c | 8 +- libmpcodecs/ad_dvdpcm.c | 4 +- libmpcodecs/ad_faad.c | 22 +- libmpcodecs/ad_ffmpeg.c | 14 +- libmpcodecs/ad_hwac3.c | 26 +- libmpcodecs/ad_hwmpa.c | 2 +- libmpcodecs/ad_imaadpcm.c | 10 +- libmpcodecs/ad_liba52.c | 6 +- libmpcodecs/ad_libdv.c | 6 +- libmpcodecs/ad_libmad.c | 24 +- libmpcodecs/ad_libvorbis.c | 10 +- libmpcodecs/ad_mpc.c | 3 +- libmpcodecs/ad_msadpcm.c | 6 +- libmpcodecs/ad_qtaudio.c | 24 +- libmpcodecs/ad_realaud.c | 36 +- libmpcodecs/ad_sample.c | 24 +- libmpcodecs/ad_speex.c | 1 - libmpcodecs/ad_twin.c | 24 +- libmpcodecs/ae.c | 10 +- libmpcodecs/ae_faac.c | 38 +- libmpcodecs/ae_lame.c | 18 +- libmpcodecs/ae_lavc.c | 25 +- libmpcodecs/ae_pcm.c | 9 +- libmpcodecs/ae_toolame.c | 51 +- libmpcodecs/ae_twolame.c | 53 +- libmpcodecs/mp_image.c | 4 +- libmpcodecs/native/rtjpegn.c | 264 +- libmpcodecs/native/rtjpegn.h | 4 +- libmpcodecs/native/xa_gsm.c | 26 +- libmpcodecs/native/xa_gsm_int.h | 4 +- libmpcodecs/pullup.c | 55 +- libmpcodecs/vd_dmo.c | 8 +- libmpcodecs/vd_dshow.c | 8 +- libmpcodecs/vd_hmblck.c | 2 +- libmpcodecs/vd_libdv.c | 6 +- libmpcodecs/vd_libmpeg2.c | 16 +- libmpcodecs/vd_lzo.c | 10 +- libmpcodecs/vd_mpegpes.c | 2 +- libmpcodecs/vd_mpng.c | 8 +- libmpcodecs/vd_mtga.c | 37 +- libmpcodecs/vd_null.c | 1 - libmpcodecs/vd_qtvideo.c | 46 +- libmpcodecs/vd_raw.c | 6 +- libmpcodecs/vd_realvid.c | 10 +- libmpcodecs/vd_sgi.c | 83 +- libmpcodecs/vd_theora.c | 14 +- libmpcodecs/vd_vfw.c | 20 +- libmpcodecs/vd_xanim.c | 16 +- libmpcodecs/vd_xvid4.c | 32 +- libmpcodecs/vd_zrmjpeg.c | 26 +- libmpcodecs/ve.c | 1 - libmpcodecs/ve_lavc.c | 56 +- libmpcodecs/ve_libdv.c | 10 +- libmpcodecs/ve_nuv.c | 12 +- libmpcodecs/ve_qtvideo.c | 6 +- libmpcodecs/ve_raw.c | 4 +- libmpcodecs/ve_vfw.c | 4 +- libmpcodecs/ve_x264.c | 12 +- libmpcodecs/ve_xvid4.c | 40 +- libmpcodecs/vf.c | 20 +- libmpcodecs/vf.h | 2 +- libmpcodecs/vf_1bpp.c | 4 +- libmpcodecs/vf_2xsai.c | 38 +- libmpcodecs/vf_ass.c | 21 +- libmpcodecs/vf_bmovl.c | 20 +- libmpcodecs/vf_boxblur.c | 32 +- libmpcodecs/vf_crop.c | 2 +- libmpcodecs/vf_cropdetect.c | 4 +- libmpcodecs/vf_decimate.c | 12 +- libmpcodecs/vf_delogo.c | 10 +- libmpcodecs/vf_detc.c | 14 +- libmpcodecs/vf_down3dright.c | 1 - libmpcodecs/vf_dsize.c | 1 - libmpcodecs/vf_dvbscale.c | 2 +- libmpcodecs/vf_eq.c | 11 +- libmpcodecs/vf_eq2.c | 2 +- libmpcodecs/vf_expand.c | 14 +- libmpcodecs/vf_field.c | 4 +- libmpcodecs/vf_fil.c | 10 +- libmpcodecs/vf_filmdint.c | 2 +- libmpcodecs/vf_flip.c | 4 +- libmpcodecs/vf_format.c | 2 +- libmpcodecs/vf_framestep.c | 2 - libmpcodecs/vf_fspp.c | 286 +- libmpcodecs/vf_halfpack.c | 7 +- libmpcodecs/vf_harddup.c | 6 +- libmpcodecs/vf_hqdn3d.c | 4 +- libmpcodecs/vf_hue.c | 9 +- libmpcodecs/vf_il.c | 10 +- libmpcodecs/vf_ilpack.c | 45 +- libmpcodecs/vf_ivtc.c | 40 +- libmpcodecs/vf_lavc.c | 14 +- libmpcodecs/vf_lavcdeint.c | 20 +- libmpcodecs/vf_mcdeint.c | 4 +- libmpcodecs/vf_mirror.c | 2 +- libmpcodecs/vf_noformat.c | 2 +- libmpcodecs/vf_noise.c | 14 +- libmpcodecs/vf_ow.c | 2 +- libmpcodecs/vf_palette.c | 4 +- libmpcodecs/vf_perspective.c | 46 +- libmpcodecs/vf_phase.c | 18 +- libmpcodecs/vf_pp.c | 19 +- libmpcodecs/vf_pp7.c | 38 +- libmpcodecs/vf_pullup.c | 16 +- libmpcodecs/vf_qp.c | 14 +- libmpcodecs/vf_rectangle.c | 4 +- libmpcodecs/vf_remove_logo.c | 8 +- libmpcodecs/vf_rgb2bgr.c | 2 +- libmpcodecs/vf_rgbtest.c | 8 +- libmpcodecs/vf_rotate.c | 4 +- libmpcodecs/vf_sab.c | 30 +- libmpcodecs/vf_scale.c | 64 +- libmpcodecs/vf_smartblur.c | 18 +- libmpcodecs/vf_softskip.c | 6 +- libmpcodecs/vf_spp.c | 80 +- libmpcodecs/vf_swapuv.c | 6 +- libmpcodecs/vf_telecine.c | 4 +- libmpcodecs/vf_tfields.c | 8 +- libmpcodecs/vf_tinterlace.c | 12 +- libmpcodecs/vf_unsharp.c | 24 +- libmpcodecs/vf_uspp.c | 86 +- libmpcodecs/vf_yuvcsp.c | 6 +- libmpcodecs/vf_yuy2.c | 8 +- libmpcodecs/vf_yvu9.c | 6 +- libmpcodecs/vf_zrmjpeg.c | 1 - libmpcodecs/vqf.h | 4 +- libmpdemux/aac_hdr.c | 4 +- libmpdemux/asf.h | 8 +- libmpdemux/asfguid.h | 4 +- libmpdemux/asfheader.c | 24 +- libmpdemux/aviheader.c | 15 +- libmpdemux/aviheader.h | 10 +- libmpdemux/aviprint.c | 3 +- libmpdemux/demux_aac.c | 34 +- libmpdemux/demux_asf.c | 56 +- libmpdemux/demux_audio.c | 18 +- libmpdemux/demux_avi.c | 62 +- libmpdemux/demux_avs.c | 66 +- libmpdemux/demux_avs.h | 14 +- libmpdemux/demux_demuxers.c | 8 +- libmpdemux/demux_film.c | 24 +- libmpdemux/demux_fli.c | 6 +- libmpdemux/demux_gif.c | 14 +- libmpdemux/demux_lmlm4.c | 64 +- libmpdemux/demux_mf.c | 8 +- libmpdemux/demux_mkv.c | 26 +- libmpdemux/demux_mng.c | 1 - libmpdemux/demux_mov.c | 118 +- libmpdemux/demux_mpg.c | 12 +- libmpdemux/demux_nemesi.c | 4 +- libmpdemux/demux_nsv.c | 72 +- libmpdemux/demux_ogg.c | 46 +- libmpdemux/demux_pva.c | 84 +- libmpdemux/demux_real.c | 128 +- libmpdemux/demux_realaud.c | 4 +- libmpdemux/demux_roq.c | 10 +- libmpdemux/demux_rtp.cpp | 24 +- libmpdemux/demux_rtp_codec.cpp | 14 +- libmpdemux/demux_smjpeg.c | 22 +- libmpdemux/demux_ts.c | 256 +- libmpdemux/demux_ty_osd.c | 221 +- libmpdemux/demux_viv.c | 38 +- libmpdemux/demux_vqf.c | 2 +- libmpdemux/demux_xmms_plugin.h | 6 +- libmpdemux/demux_y4m.c | 22 +- libmpdemux/extension.c | 1 - libmpdemux/genres.h | 2 +- libmpdemux/mf.c | 27 +- libmpdemux/mp3_hdr.c | 13 +- libmpdemux/mp3_hdr.h | 2 +- libmpdemux/mp_taglists.c | 1 - libmpdemux/mpeg_hdr.c | 64 +- libmpdemux/mpeg_packetizer.c | 14 +- libmpdemux/mpeg_packetizer.h | 4 +- libmpdemux/muxer.c | 25 +- libmpdemux/muxer_avi.c | 6 +- libmpdemux/muxer_lavf.c | 48 +- libmpdemux/muxer_mpeg.c | 401 +- libmpdemux/parse_es.c | 10 +- libmpdemux/parse_mp4.c | 7 +- libmpdemux/parse_mp4.h | 49 +- libmpdemux/qtpalette.h | 4 +- libmpdemux/video.c | 21 +- libmpdemux/yuv4mpeg.c | 56 +- libmpdemux/yuv4mpeg.h | 2 - libmpdemux/yuv4mpeg_intern.h | 2 +- libmpdemux/yuv4mpeg_ratio.c | 5 +- libvo/aclib_template.c | 1 - libvo/aspect.c | 1 - libvo/aspecttest.c | 3 +- libvo/font_load.c | 28 +- libvo/font_load.h | 4 +- libvo/font_load_ft.c | 74 +- libvo/geometry.c | 6 +- libvo/gl_common.c | 7 +- libvo/gl_common.h | 4 +- libvo/gtf.c | 122 +- libvo/gtf.h | 10 +- libvo/jpeg_enc.c | 100 +- libvo/jpeg_enc.h | 4 +- libvo/mga_common.c | 30 +- libvo/osd.c | 1 - libvo/osd_template.c | 8 +- libvo/spuenc.c | 28 +- libvo/sub.c | 54 +- libvo/vesa_lvo.c | 4 +- libvo/video_out.c | 1 - libvo/videodev_mjpeg.h | 2 +- libvo/vo_3dfx.c | 86 +- libvo/vo_aa.c | 46 +- libvo/vo_bl.c | 38 +- libvo/vo_caca.c | 6 +- libvo/vo_corevideo.h | 14 +- libvo/vo_corevideo.m | 206 +- libvo/vo_cvidix.c | 6 +- libvo/vo_dga.c | 34 +- libvo/vo_directfb2.c | 190 +- libvo/vo_directx.c | 242 +- libvo/vo_dxr2.c | 42 +- libvo/vo_dxr3.c | 118 +- libvo/vo_fbdev2.c | 16 +- libvo/vo_gif89a.c | 29 +- libvo/vo_gl.c | 8 +- libvo/vo_ivtv.c | 30 +- libvo/vo_jpeg.c | 35 +- libvo/vo_md5sum.c | 3 +- libvo/vo_mga.c | 7 +- libvo/vo_mpegpes.c | 12 +- libvo/vo_null.c | 4 +- libvo/vo_png.c | 48 +- libvo/vo_pnm.c | 17 +- libvo/vo_quartz.c | 2 +- libvo/vo_quartz.h | 6 +- libvo/vo_s3fb.c | 46 +- libvo/vo_sdl.c | 260 +- libvo/vo_tdfx_vid.c | 37 +- libvo/vo_v4l2.c | 26 +- libvo/vo_vdpau.c | 2 +- libvo/vo_vesa.c | 60 +- libvo/vo_winvidix.c | 76 +- libvo/vo_x11.c | 8 +- libvo/vo_xover.c | 20 +- libvo/vo_yuv4mpeg.c | 62 +- libvo/vo_zr.c | 120 +- libvo/vo_zr2.c | 44 +- libvo/vosub_vidix.c | 18 +- libvo/w32_common.c | 8 +- libvo/x11_common.c | 20 +- loader/afl.c | 158 +- loader/com.h | 2 +- loader/dmo/DMO_AudioDecoder.c | 18 +- loader/dmo/DMO_VideoDecoder.c | 35 +- loader/dshow/DS_AudioDecoder.c | 16 +- loader/dshow/DS_Filter.c | 8 +- loader/dshow/DS_VideoDecoder.c | 62 +- loader/dshow/allocator.c | 2 +- loader/dshow/cmediasample.c | 14 +- loader/dshow/inputpin.c | 22 +- loader/dshow/libwin32.h | 6 +- loader/dshow/mediatype.c | 6 +- loader/dshow/mediatype.h | 6 +- loader/dshow/outputpin.c | 18 +- loader/elfdll.c | 6 +- loader/ext.c | 2 +- loader/ldt_keeper.c | 2 +- loader/module.c | 34 +- loader/pe_image.c | 178 +- loader/pe_resource.c | 16 +- loader/qtx/list.c | 4 +- loader/qtx/qtxload.c | 6 +- loader/qtx/qtxsdk/components.h | 4 +- loader/resource.c | 44 +- loader/vfl.c | 23 +- loader/win32.c | 76 +- loader/wine/avifmt.h | 34 +- loader/wine/driver.h | 2 +- loader/wine/ldt.h | 2 +- loader/wine/mmreg.h | 2 +- loader/wine/module.h | 4 +- loader/wine/msacm.h | 40 +- loader/wine/msacmdrv.h | 2 +- loader/wine/ntdef.h | 4 +- loader/wine/vfw.h | 14 +- loader/wine/winbase.h | 20 +- loader/wine/windef.h | 20 +- loader/wine/winnt.h | 188 +- loader/wine/winreg.h | 2 +- loader/wine/winuser.h | 74 +- loader/wrapper.S | 31 +- loader/wrapper.h | 1 - m_config.c | 20 +- m_config.h | 8 +- m_option.c | 108 +- m_option.h | 22 +- m_property.c | 14 +- m_property.h | 2 +- m_struct.c | 10 +- mencoder.c | 46 +- metadata.h | 1 - mixer.c | 3 +- mp3lib/dct12.c | 6 +- mp3lib/dct36.c | 7 +- mp3lib/dct64_altivec.c | 22 +- mp3lib/decod386.c | 2 +- mp3lib/huffman.h | 16 +- mp3lib/l2tables.h | 5 +- mp3lib/layer1.c | 14 +- mp3lib/layer2.c | 36 +- mp3lib/layer3.c | 94 +- mp3lib/sr1.c | 4 +- mp3lib/test.c | 10 +- mp3lib/test2.c | 12 +- mp_core.h | 2 +- mp_msg.c | 2 +- mpcommon.c | 2 +- mplayer.c | 168 +- osdep/getch2-os2.c | 1 - osdep/getch2-win.c | 34 +- osdep/getch2.c | 1 - osdep/glob-win.c | 8 +- osdep/keycodes.h | 2 +- osdep/macosx_finder_args.c | 6 +- osdep/mmap_anon.c | 6 +- osdep/mplayer.rc | 9 +- osdep/priority.c | 1 - osdep/priority.h | 1 - osdep/strsep.c | 2 +- osdep/timer-darwin.c | 8 +- osdep/timer-linux.c | 4 +- osdep/timer-win2.c | 4 +- parser-cfg.c | 6 +- parser-mecmd.c | 6 +- parser-mpcmd.c | 16 +- playtree.c | 62 +- playtree.h | 8 +- playtreeparser.c | 44 +- rpm/mplayer.spec | 4 +- spudec.c | 14 +- stream/ai_alsa.c | 10 +- stream/ai_alsa1x.c | 10 +- stream/ai_oss.c | 6 +- stream/asf_mmst_streaming.c | 112 +- stream/asf_streaming.c | 47 +- stream/audio_in.c | 4 +- stream/audio_in.h | 6 +- stream/cache2.c | 46 +- stream/cdd.h | 2 +- stream/cdinfo.c | 18 +- stream/cookies.c | 4 +- stream/cookies.h | 2 +- stream/dvb_tune.c | 18 +- stream/freesdp/common.h | 4 +- stream/freesdp/parser.c | 6 +- stream/freesdp/parser.h | 16 +- stream/freesdp/parserpriv.h | 10 +- stream/freesdp/priv.h | 4 +- stream/frequencies.c | 46 +- stream/frequencies.h | 4 +- stream/http.c | 42 +- stream/http.h | 2 +- stream/librtsp/rtsp.c | 88 +- stream/librtsp/rtsp.h | 4 +- stream/librtsp/rtsp_rtp.c | 64 +- stream/librtsp/rtsp_session.c | 18 +- stream/network.c | 20 +- stream/open.c | 3 +- stream/pnm.c | 122 +- stream/pnm.h | 2 +- stream/pvr.h | 2 +- stream/realrtsp/asmrp.c | 37 +- stream/realrtsp/real.c | 38 +- stream/realrtsp/real.h | 2 +- stream/realrtsp/rmff.c | 58 +- stream/realrtsp/rmff.h | 10 +- stream/realrtsp/sdpplin.c | 29 +- stream/realrtsp/sdpplin.h | 2 +- stream/realrtsp/xbuffer.c | 6 +- stream/realrtsp/xbuffer.h | 2 +- stream/rtp.c | 48 +- stream/stream.c | 24 +- stream/stream.h | 6 +- stream/stream_cdda.c | 16 +- stream/stream_cddb.c | 80 +- stream/stream_cue.c | 9 +- stream/stream_dvb.c | 56 +- stream/stream_dvd.c | 18 +- stream/stream_dvd_common.c | 2 +- stream/stream_dvdnav.c | 16 +- stream/stream_file.c | 4 +- stream/stream_ftp.c | 32 +- stream/stream_live555.c | 2 +- stream/stream_mf.c | 4 +- stream/stream_nemesi.c | 1 - stream/stream_netstream.c | 22 +- stream/stream_netstream.h | 8 +- stream/stream_pvr.c | 170 +- stream/stream_radio.c | 27 +- stream/stream_rtp.c | 14 +- stream/stream_rtsp.c | 16 +- stream/stream_smb.c | 34 +- stream/stream_tv.c | 2 +- stream/stream_udp.c | 14 +- stream/stream_vcd.c | 6 +- stream/stream_vstream.c | 2 +- stream/tcp.c | 34 +- stream/tv.c | 2 +- stream/tv.h | 18 +- stream/tvi_bsdbt848.c | 90 +- stream/tvi_def.h | 4 +- stream/tvi_dshow.c | 88 +- stream/tvi_dshow.h | 4 +- stream/tvi_v4l.c | 6 +- stream/tvi_v4l2.c | 56 +- stream/tvi_vbi.c | 20 +- stream/udp.c | 4 +- stream/url.c | 18 +- stream/url.h | 2 +- stream/vcd_read.h | 6 +- stream/vcd_read_darwin.h | 28 +- sub_cc.c | 9 +- sub_cc.h | 1 - subopt-helper.c | 1 - subopt-helper.h | 2 +- subreader.c | 32 +- subreader.h | 4 +- unrar_exec.c | 1 - vidix/AsmMacros.h | 60 +- vidix/cyberblade_vid.c | 18 +- vidix/dha.c | 10 +- vidix/dhahelper/dhahelper.c | 20 +- vidix/dhahelper/test.c | 6 +- vidix/dhahelperwin/dhahelper.c | 52 +- vidix/dhahelperwin/dhasetup.c | 2 +- vidix/drivers.c | 8 +- vidix/glint_regs.h | 24 +- vidix/ivtv_vid.c | 24 +- vidix/mach64.h | 2 +- vidix/mach64_vid.c | 76 +- vidix/mga_vid.c | 130 +- vidix/mtrr.c | 2 +- vidix/nvidia_vid.c | 57 +- vidix/pci.c | 112 +- vidix/pci.db |25500 ++++++++++++++++---------------- vidix/pci_db2c.awk | 14 +- vidix/pm3_regs.h | 10 +- vidix/pm3_vid.c | 10 +- vidix/radeon_vid.c | 80 +- vidix/s3_regs.h | 8 +- vidix/s3_vid.c | 10 +- vidix/sis_vid.c | 2 +- vidix/sysdep/AsmMacros_x86.h | 30 +- vidix/sysdep/libdha_os2.c | 26 +- vidix/sysdep/libdha_win32.c | 10 +- vidix/sysdep/pci_alpha.c | 3 +- vidix/sysdep/pci_arm32.c | 4 +- vidix/sysdep/pci_ia64.c | 4 +- vidix/sysdep/pci_linux.c | 26 +- vidix/sysdep/pci_lynx.c | 20 +- vidix/sysdep/pci_os2.c | 12 +- vidix/sysdep/pci_powerpc.c | 2 +- vidix/sysdep/pci_sparc.c | 4 +- vidix/sysdep/pci_x86.c | 4 +- vidix/unichrome_regs.h | 72 +- vidix/unichrome_vid.c | 6 +- vidix/vidix.c | 10 +- vobsub.c | 4 +- vobsub.h | 1 - xvid_vbr.c | 12 +- xvid_vbr.h | 2 +- 750 files changed, 23138 insertions(+), 23348 deletions(-) commit 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 Merge: e306174 eafe5b7 Author: Uoti Urpala Date: Tue Jul 7 02:06:48 2009 +0300 Merge svn changes up to r29304 commit e306174952d42e1cd6cc5efc50ae6bb0410501bc Author: Amar Takhar Date: Tue Jul 7 01:15:02 2009 +0300 Translation system changes part 2: replace macros by strings Replace all MSGTR_ macros in the source by the corresponding English string. codec-cfg.c | 58 +++++++------- command.c | 144 +++++++++++++++++----------------- edl.c | 18 +++-- input/appleir.c | 8 +- input/input.c | 58 +++++++------- input/joystick.c | 18 ++-- input/lirc.c | 6 +- libaf/af_ladspa.c | 30 ++++---- libaf/af_lavcac3enc.c | 6 +- libaf/af_scaletempo.c | 10 +- libaf/format.c | 2 +- libao2/ao_alsa.c | 107 +++++++++++++------------ libao2/ao_alsa5.c | 46 +++++----- libao2/ao_arts.c | 12 ++-- libao2/ao_dxr2.c | 4 +- libao2/ao_esd.c | 6 +- libao2/ao_ivtv.c | 2 +- libao2/ao_mpegpes.c | 4 +- libao2/ao_oss.c | 24 +++--- libao2/ao_pcm.c | 6 +- libao2/ao_sdl.c | 12 ++-- libao2/ao_sgi.c | 28 +++--- libao2/ao_sun.c | 8 +- libao2/ao_v4l2.c | 2 +- libao2/audio_out.c | 10 +- libmenu/menu.c | 26 +++--- libmenu/menu_cmdlist.c | 8 +- libmenu/menu_console.c | 16 ++-- libmenu/menu_filesel.c | 12 ++-- libmenu/menu_param.c | 12 ++-- libmenu/menu_pt.c | 4 +- libmenu/menu_txt.c | 8 +- libmenu/vf_menu.c | 4 +- libmpcodecs/ad_acm.c | 4 +- libmpcodecs/ad_dmo.c | 2 +- libmpcodecs/ad_dshow.c | 2 +- libmpcodecs/ad_dvdpcm.c | 2 +- libmpcodecs/ad_ffmpeg.c | 6 +- libmpcodecs/ad_libdv.c | 2 +- libmpcodecs/ad_realaud.c | 2 +- libmpcodecs/ae_lame.c | 182 +++++++++++++++++++++++++++++++++++++++--- libmpcodecs/ae_lavc.c | 8 +- libmpcodecs/dec_audio.c | 32 ++++---- libmpcodecs/dec_video.c | 24 +++--- libmpcodecs/vd.c | 17 +++-- libmpcodecs/vd_dmo.c | 8 +- libmpcodecs/vd_dshow.c | 8 +- libmpcodecs/vd_ffmpeg.c | 22 +++--- libmpcodecs/vd_realvid.c | 2 +- libmpcodecs/vd_vfw.c | 2 +- libmpcodecs/ve_lavc.c | 8 +- libmpcodecs/ve_raw.c | 2 +- libmpcodecs/ve_vfw.c | 12 ++-- libmpcodecs/vf.c | 14 ++-- libmpcodecs/vf_ass.c | 4 +- libmpcodecs/vf_crop.c | 2 +- libmpcodecs/vf_cropdetect.c | 2 +- libmpcodecs/vf_expand.c | 6 +- libmpcodecs/vf_format.c | 2 +- libmpcodecs/vf_framestep.c | 2 +- libmpcodecs/vf_lavc.c | 4 +- libmpcodecs/vf_noformat.c | 2 +- libmpcodecs/vf_palette.c | 2 +- libmpcodecs/vf_test.c | 2 +- libmpcodecs/vf_tile.c | 2 +- libmpcodecs/vf_yuy2.c | 2 +- libmpcodecs/vf_yvu9.c | 2 +- libmpdemux/asfheader.c | 28 +++--- libmpdemux/aviheader.c | 50 ++++++------ libmpdemux/demux_asf.c | 6 +- libmpdemux/demux_audio.c | 2 +- libmpdemux/demux_avi.c | 24 +++--- libmpdemux/demux_demuxers.c | 2 +- libmpdemux/demux_lavf.c | 6 +- libmpdemux/demux_lmlm4.c | 4 +- libmpdemux/demux_mkv.c | 34 ++++---- libmpdemux/demux_mov.c | 14 ++-- libmpdemux/demux_mpg.c | 8 +- libmpdemux/demux_nut.c | 4 +- libmpdemux/demux_real.c | 10 +- libmpdemux/demux_ty.c | 2 +- libmpdemux/demux_viv.c | 4 +- libmpdemux/demux_xmms.c | 6 +- libmpdemux/demuxer.c | 54 +++++++------ libmpdemux/muxer.c | 8 +- libmpdemux/muxer_avi.c | 8 +- libmpdemux/muxer_lavf.c | 4 +- libmpdemux/muxer_mpeg.c | 4 +- libmpdemux/muxer_rawaudio.c | 6 +- libmpdemux/video.c | 22 +++--- libvo/aspect.c | 4 +- libvo/font_load_ft.c | 16 ++-- libvo/mga_common.c | 24 +++--- libvo/sub.c | 26 +++--- libvo/vesa_lvo.c | 10 +- libvo/video_out.c | 6 +- libvo/vo_3dfx.c | 18 ++-- libvo/vo_aa.c | 11 ++- libvo/vo_dxr3.c | 106 ++++++++++++------------ libvo/vo_jpeg.c | 44 +++++----- libvo/vo_md5sum.c | 14 ++-- libvo/vo_mga.c | 4 +- libvo/vo_null.c | 2 +- libvo/vo_png.c | 10 +- libvo/vo_pnm.c | 50 ++++++------ libvo/vo_sdl.c | 26 +++--- libvo/vo_svga.c | 20 +++--- libvo/vo_tdfx_vid.c | 42 +++++----- libvo/vo_tdfxfb.c | 20 +++--- libvo/vo_tga.c | 2 +- libvo/vo_vesa.c | 78 +++++++++--------- libvo/vo_xv.c | 24 ++++-- libvo/vo_yuv4mpeg.c | 22 +++--- libvo/vosub_vidix.c | 26 +++--- libvo/x11_common.c | 6 +- loader/ldt_keeper.c | 2 +- m_config.c | 28 +++--- m_property.c | 6 +- mencoder.c | 143 +++++++++++++++++---------------- mixer.c | 6 +- mpcommon.c | 4 +- mplayer.c | 186 +++++++++++++++++++++++++++---------------- osdep/priority.c | 2 +- parser-mecmd.c | 8 +- parser-mpcmd.c | 10 +- stream/ai_alsa.c | 26 +++--- stream/ai_alsa1x.c | 32 ++++---- stream/ai_oss.c | 20 +++--- stream/asf_mmst_streaming.c | 52 ++++++------ stream/asf_streaming.c | 54 ++++++------ stream/audio_in.c | 12 ++-- stream/cache2.c | 2 +- stream/cdinfo.c | 6 +- stream/network.c | 40 +++++---- stream/stream.c | 2 +- stream/stream_cdda.c | 6 +- stream/stream_cddb.c | 74 +++++++++--------- stream/stream_cue.c | 40 +++++----- stream/stream_dvd.c | 56 +++++++------- stream/stream_dvdnav.c | 6 +- stream/stream_file.c | 4 +- stream/stream_live555.c | 2 +- stream/stream_radio.c | 128 +++++++++++++++--------------- stream/stream_smb.c | 4 +- stream/stream_vcd.c | 6 +- stream/tcp.c | 20 +++--- stream/tv.c | 89 +++++++++++---------- stream/tvi_bsdbt848.c | 62 +++++++------- stream/tvi_dshow.c | 84 ++++++++++---------- stream/tvi_vbi.c | 6 +- stream/url.c | 22 +++--- 151 files changed, 1770 insertions(+), 1515 deletions(-) commit b5972d6f14c04384d88d3f813b435d484562403f Author: Amar Takhar Date: Mon Jul 6 02:41:23 2009 +0300 Translation system changes part 1: wrap translated strings Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings. codec-cfg.c | 58 +++++++++--------- command.c | 142 +++++++++++++++++++++--------------------- edl.c | 16 +++--- input/appleir.c | 8 +- input/input.c | 60 +++++++++--------- input/joystick.c | 18 +++--- input/lirc.c | 6 +- libaf/af_ladspa.c | 28 ++++---- libaf/af_lavcac3enc.c | 6 +- libaf/af_scaletempo.c | 20 +++--- libaf/format.c | 2 +- libao2/ao_alsa.c | 100 +++++++++++++++--------------- libao2/ao_alsa5.c | 46 +++++++------- libao2/ao_arts.c | 12 ++-- libao2/ao_dxr2.c | 4 +- libao2/ao_esd.c | 6 +- libao2/ao_ivtv.c | 2 +- libao2/ao_mpegpes.c | 4 +- libao2/ao_oss.c | 24 ++++---- libao2/ao_pcm.c | 6 +- libao2/ao_sdl.c | 12 ++-- libao2/ao_sgi.c | 28 ++++---- libao2/ao_sun.c | 8 +- libao2/ao_v4l2.c | 2 +- libao2/audio_out.c | 10 ++-- libmenu/menu.c | 26 ++++---- libmenu/menu_cmdlist.c | 8 +- libmenu/menu_console.c | 16 +++--- libmenu/menu_filesel.c | 12 ++-- libmenu/menu_param.c | 12 ++-- libmenu/menu_pt.c | 4 +- libmenu/menu_txt.c | 8 +- libmenu/vf_menu.c | 4 +- libmpcodecs/ad_acm.c | 4 +- libmpcodecs/ad_dmo.c | 2 +- libmpcodecs/ad_dshow.c | 2 +- libmpcodecs/ad_dvdpcm.c | 2 +- libmpcodecs/ad_ffmpeg.c | 6 +- libmpcodecs/ad_libdv.c | 2 +- libmpcodecs/ad_realaud.c | 2 +- libmpcodecs/ae_lame.c | 26 ++++---- libmpcodecs/ae_lavc.c | 8 +- libmpcodecs/dec_audio.c | 32 +++++----- libmpcodecs/dec_video.c | 26 ++++---- libmpcodecs/vd.c | 14 ++-- libmpcodecs/vd_dmo.c | 8 +- libmpcodecs/vd_dshow.c | 8 +- libmpcodecs/vd_ffmpeg.c | 22 +++--- libmpcodecs/vd_realvid.c | 2 +- libmpcodecs/vd_vfw.c | 2 +- libmpcodecs/ve_lavc.c | 8 +- libmpcodecs/ve_raw.c | 2 +- libmpcodecs/ve_vfw.c | 12 ++-- libmpcodecs/vf.c | 14 ++-- libmpcodecs/vf_ass.c | 4 +- libmpcodecs/vf_crop.c | 2 +- libmpcodecs/vf_cropdetect.c | 2 +- libmpcodecs/vf_expand.c | 6 +- libmpcodecs/vf_format.c | 2 +- libmpcodecs/vf_framestep.c | 2 +- libmpcodecs/vf_lavc.c | 4 +- libmpcodecs/vf_noformat.c | 2 +- libmpcodecs/vf_palette.c | 2 +- libmpcodecs/vf_test.c | 2 +- libmpcodecs/vf_tile.c | 2 +- libmpcodecs/vf_yuy2.c | 2 +- libmpcodecs/vf_yvu9.c | 2 +- libmpdemux/asfheader.c | 28 ++++---- libmpdemux/aviheader.c | 50 ++++++++-------- libmpdemux/demux_asf.c | 6 +- libmpdemux/demux_audio.c | 2 +- libmpdemux/demux_avi.c | 24 ++++---- libmpdemux/demux_demuxers.c | 2 +- libmpdemux/demux_lavf.c | 6 +- libmpdemux/demux_lmlm4.c | 4 +- libmpdemux/demux_mkv.c | 32 +++++----- libmpdemux/demux_mov.c | 14 ++-- libmpdemux/demux_mpg.c | 8 +- libmpdemux/demux_nut.c | 4 +- libmpdemux/demux_real.c | 10 ++-- libmpdemux/demux_ty.c | 2 +- libmpdemux/demux_viv.c | 4 +- libmpdemux/demux_xmms.c | 6 +- libmpdemux/demuxer.c | 50 ++++++++-------- libmpdemux/muxer.c | 8 +- libmpdemux/muxer_avi.c | 8 +- libmpdemux/muxer_lavf.c | 4 +- libmpdemux/muxer_mpeg.c | 4 +- libmpdemux/muxer_rawaudio.c | 6 +- libmpdemux/video.c | 22 +++--- libvo/aspect.c | 4 +- libvo/font_load_ft.c | 16 +++--- libvo/mga_common.c | 24 ++++---- libvo/sub.c | 26 ++++---- libvo/vesa_lvo.c | 10 ++-- libvo/video_out.c | 6 +- libvo/vo_3dfx.c | 18 +++--- libvo/vo_aa.c | 4 +- libvo/vo_dxr3.c | 106 ++++++++++++++++---------------- libvo/vo_jpeg.c | 42 ++++++------ libvo/vo_md5sum.c | 14 ++-- libvo/vo_mga.c | 4 +- libvo/vo_null.c | 2 +- libvo/vo_png.c | 10 ++-- libvo/vo_pnm.c | 46 +++++++------- libvo/vo_sdl.c | 26 ++++---- libvo/vo_svga.c | 20 +++--- libvo/vo_tdfx_vid.c | 42 ++++++------ libvo/vo_tdfxfb.c | 20 +++--- libvo/vo_tga.c | 2 +- libvo/vo_vesa.c | 76 ++++++++++++------------ libvo/vo_xv.c | 16 +++--- libvo/vo_yuv4mpeg.c | 22 +++--- libvo/vosub_vidix.c | 26 ++++---- libvo/x11_common.c | 6 +- loader/ldt_keeper.c | 2 +- m_config.c | 28 ++++---- m_property.c | 6 +- mencoder.c | 138 +++++++++++++++++++++--------------------- mixer.c | 6 +- mpcommon.c | 4 +- mplayer.c | 140 +++++++++++++++++++++--------------------- osdep/priority.c | 2 +- parser-mecmd.c | 8 +- parser-mpcmd.c | 10 ++-- stream/ai_alsa.c | 26 ++++---- stream/ai_alsa1x.c | 32 +++++----- stream/ai_oss.c | 20 +++--- stream/asf_mmst_streaming.c | 52 ++++++++-------- stream/asf_streaming.c | 54 ++++++++-------- stream/audio_in.c | 12 ++-- stream/cache2.c | 2 +- stream/cdinfo.c | 6 +- stream/network.c | 34 +++++----- stream/stream.c | 2 +- stream/stream_cdda.c | 6 +- stream/stream_cddb.c | 74 +++++++++++----------- stream/stream_cue.c | 40 ++++++------ stream/stream_dvd.c | 56 +++++++++--------- stream/stream_dvdnav.c | 6 +- stream/stream_file.c | 4 +- stream/stream_live555.c | 2 +- stream/stream_radio.c | 128 +++++++++++++++++++------------------- stream/stream_smb.c | 4 +- stream/stream_vcd.c | 6 +- stream/tcp.c | 20 +++--- stream/tv.c | 82 ++++++++++++------------ stream/tvi_bsdbt848.c | 62 +++++++++--------- stream/tvi_dshow.c | 84 +++++++++++++------------- stream/tvi_vbi.c | 6 +- stream/url.c | 22 +++--- 151 files changed, 1517 insertions(+), 1517 deletions(-) commit 7394680e4eb7b21cd8bf38b973ff66881889be26 Author: Uoti Urpala Date: Mon Jul 6 19:54:38 2009 +0300 Add temporary no-op translation function stubs codec-cfg.c | 1 + mp_msg.c | 5 +++++ mp_msg.h | 6 ++++++ 3 files changed, 12 insertions(+), 0 deletions(-) commit cd6a9ea77a9535542ec4e979ba239b176ba7d258 Author: diego Date: Sun Jul 5 20:10:59 2009 +0000 The AltiVec code in libswscale no longer is under GPL. Remove one erroneous preprocessor check for CONFIG_GPL in the AltiVec code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29412 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4200f091ff71796bedb807a3cfec9b49cf705810 Author: diego Date: Sat Jul 4 13:26:51 2009 +0000 Add a section about handling external code to the policy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29411 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/svn-howto.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit bc3743fd63c6a8f3344dc538062704d8947a985f Author: compn Date: Fri Jul 3 16:10:58 2009 +0000 add truemotion rt binary codec for TR20 fourcc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29410 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 01dcb1caf9fc4b961b0e245be14653290e9b578d Merge: 37ecfdd a173935 Author: Kovensky Date: Wed Jul 1 12:33:32 2009 -0300 Merge commit 'greg/libass' into mt commit 37ecfdd91e1a120a4c2b9ac005a0a70f3df1bea8 Merge: 50d1a84 2c7bb6e Author: Kovensky Date: Wed Jul 1 12:29:59 2009 -0300 Merge branch 'mt' of git://repo.or.cz/mplayer into mt commit ea03c9b95aa8ef394b3d59d34c2a0bb543561a35 Author: mru Date: Wed Jul 1 12:40:28 2009 +0000 Use enum PixelFormat in sws_format_name() prototype git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29409 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a173935f2a07ced224b1cb7b6cba45f13d722236 Author: Grigori Goronzy Date: Mon Jun 29 18:55:12 2009 +0200 Pass physical aspect ratio to libass Do not assume 1:1 PAR and calculate aspect ratio via width / height, instead directly pass the physical aspect ratio to libass. libmpcodecs/vf_vo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9f30919331b91b50b5c46950f91372a233f7d677 Author: Grigori Goronzy Date: Mon Jun 29 17:20:39 2009 +0200 process_force_style renamed, API change. process_force_style was renamed to ass_process_force_style in libass and is now exposed in ass.h ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 498901159b09d349ae562f98c25c7f4ec5ceac6d Author: Grigori Goronzy Date: Mon Jun 29 17:19:18 2009 +0200 Pass original size of the decoded video to libass. libmpcodecs/vf_ass.c | 3 ++- libmpcodecs/vf_vo.c | 2 +- libvo/video_out.h | 1 + libvo/vo_gl.c | 2 ++ libvo/vo_vdpau.c | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) commit 542d2e56ce4f1aa1e02dcbd239dabf833dd4b2ea Author: reimar Date: Sun Jun 28 13:19:26 2009 +0000 Print information about chapters with -identify. Patch by Adrian Stutz [adrian sttz ch] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29408 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 15db8a0c37b2327e79d5f167facef0b4db8bf61b Author: reimar Date: Sun Jun 28 13:17:42 2009 +0000 Make set_property chapter 0-based like all other chapter-related property functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29407 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 2c7bb6ed3797b1d1a2e306e0e80d893b92111ca9 Merge: 80e2695 91d0d3a Author: Uoti Urpala Date: Sat Jun 27 23:01:44 2009 +0300 Merge branch 'master' into mt commit 80e269552555ee0f483d65fb7ef39aa522959519 Author: Uoti Urpala Date: Sat Jun 27 23:00:44 2009 +0300 Update FFmpeg-mt submodule This should fix a bug that broke VDPAU in -mt builds. ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c6672ee42c4f7e6fbbb77e6dcbffa87ffa84e605 Author: compn Date: Sat Jun 27 12:53:58 2009 +0000 add binary codec for NTN1 and NTN2 fourcc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29406 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit 7a264031e226b0bdea2006ccf91f3442fbf5d8d4 Author: compn Date: Sat Jun 27 11:57:20 2009 +0000 add 0xA106 twocc to aac decoders, fixes facebook sample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29405 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit ec7dc561481ae6acf70c85e24b3d045c6af20b9f Author: cehoyos Date: Fri Jun 26 21:32:25 2009 +0000 Fix some blu-ray samples: HDMV == H264 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29404 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 71723dc2c62f054b08eadc880f397e8cb308d6d9 Author: ben Date: Fri Jun 26 20:21:38 2009 +0000 Increase slave mode buffer so that one can load files with a deeper path (or bigger URLs). Patch by Mathieu Schroeter (mathieu DOT schroeter AT gamesover DOT ch). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29403 b3059339-0415-0410-9bf9-f77b7e298cf2 input/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 95dcb653798ef9b070d58e8958830bee3ddeca72 Author: reimar Date: Fri Jun 26 16:20:15 2009 +0000 Use memcpy_pic2 instead of reimplementing it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29402 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) commit 32a7d61acc6df033b55a341b38afd5d709e37882 Author: reimar Date: Fri Jun 26 15:41:34 2009 +0000 Close /dev/tty again on uninit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29401 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 158aca92aec4a76825973714c92f3b3d458e7813 Author: reimar Date: Fri Jun 26 15:39:35 2009 +0000 Fix indentation broken in last patch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29400 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit fc24a623a20f61693c7a70f173bb00519ffc72db Author: reimar Date: Fri Jun 26 15:38:40 2009 +0000 Get rid of completely pointless vt_doit variable git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29399 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit 83ed88fb96dfb000381609d8f08aacbc6e5966ff Author: reimar Date: Fri Jun 26 15:28:30 2009 +0000 10l, use fopen directly instead of open + fdopen git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29398 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) commit b3e157882801d7a6a78f4d6674f1a798c079cee7 Author: reimar Date: Fri Jun 26 15:22:15 2009 +0000 Use a single err_out in fb_preinit, also fixes a leak when vo_dbpp has an unexpected value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29397 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) commit e56dbbfd3ca602169f38669a48c554a46c1202a0 Author: reimar Date: Fri Jun 26 15:14:48 2009 +0000 Use FFALIGN and FFMAX3 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29396 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 96de64de92ca6e0ccb10cbb4ae96126ed8790d8e Author: reimar Date: Fri Jun 26 14:43:03 2009 +0000 Remove useless casts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29395 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 2b19b2dcbae11860e7723bf0447e2da67ea68c4f Author: reimar Date: Fri Jun 26 14:40:31 2009 +0000 fbdev: remove pointless () git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29394 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit 437efdc855d2ccf83d482f40a90041609e7ac373 Author: reimar Date: Fri Jun 26 13:54:22 2009 +0000 Replace incorrect use of strncpy by av_strlcpy. Only a real issue if inet_ntoa can actually return a string of more than 255 bytes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29393 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/tcp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit eeb99c1c1413bb1d51d84ce9de4d21c0dec6fda2 Author: reimar Date: Fri Jun 26 13:41:01 2009 +0000 Use the RESET_GEOMETRY macro in one more place instead of duplicating its code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29392 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/geometry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8e2054934ae54e87334d7708227f3a91f109825d Author: reimar Date: Fri Jun 26 13:34:40 2009 +0000 100l, RESET_GEOMETRY must reset values to INT_MIN, not -1, -1 is a valid value for e.g. the offsets. Patch by Benson Mitchell [benson mitchell gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29391 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/geometry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 114b73816fa0a3b5cdb7a156ebd92f91063e0c6d Author: diego Date: Thu Jun 25 20:06:03 2009 +0000 AltiVec code and runtime cpudetect do not require CONFIG_GPL. Make sure the latter is only checked for x86 optimizations, which are GPL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29390 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit e4ac99c4dbf09216bc5b908c3fd724226f48f6c3 Author: diego Date: Thu Jun 25 11:27:36 2009 +0000 The AltiVec optimizations of libswscale are no longer under GPL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29389 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 052fee1295d788eafd7b9a49ae7cf3c989668a18 Author: diego Date: Thu Jun 25 10:14:05 2009 +0000 PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29388 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 63b0136feadd711bbaf2cd8f884cce7bc1986a2b Author: diego Date: Wed Jun 24 23:31:17 2009 +0000 Modern Solaris versions have different default CD-ROM devices. patch by Pawel Tecza, ptecza uw.edu pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29387 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 91d0d3a0824c755608c1c69d6b1192d114a50a96 Author: Grigori Goronzy Date: Tue Jun 23 06:31:13 2009 +0200 Add OSS4 vmix volume control to ao_oss Support for per-application volume control, introduced by OSS4. This adds a check in configure to add the proper include path to the CFLAGS, if needed. The path is taken from /etc/oss.conf. configure | 9 +++++++++ libao2/ao_oss.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) commit 50d1a845744f7cf38d28581ea746b0a8829444aa Author: Kovensky Date: Wed Jun 24 15:42:59 2009 -0300 Revert "WIP: PAR correction + Detect aspect ratio change properly." This reverts commit 891371dd54bb592901632d8ba2d349386590fb46. Conflicts: libvo/vo_gl.c libmpcodecs/vf_ass.c | 2 +- libmpcodecs/vf_vo.c | 2 +- libvo/video_out.h | 1 - libvo/vo_gl.c | 3 --- libvo/vo_vdpau.c | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) commit 728b7581619072b0fb16b217b1bb5a1783e823b8 Author: Kovensky Date: Wed Jun 24 15:41:12 2009 -0300 Merge needed changes from 'greg/libass' ass_mp.c | 12 ++++-------- ass_mp.h | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) commit 18437bda796d2e13026c035b5603372a75af52f6 Merge: 8722a21 454f03c Author: Kovensky Date: Wed Jun 24 15:23:04 2009 -0300 Merge libass from 'greg/libass' Conflicts: ass_mp.c ass_mp.h commit 8722a2169fcc9ad6837b4d216f9262c7ca0908a0 Author: Kovensky Date: Wed Jun 24 15:20:57 2009 -0300 Remove old libass Preparation to use the standalone libass. .gitmodules | 3 + libass | 1 + libass/ass.c | 1135 ------------------ libass/ass.h | 229 ---- libass/ass_bitmap.c | 342 ------ libass/ass_bitmap.h | 53 - libass/ass_cache.c | 386 ------ libass/ass_cache.h | 98 -- libass/ass_cache_template.c | 88 -- libass/ass_font.c | 369 ------ libass/ass_font.h | 60 - libass/ass_fontconfig.c | 519 --------- libass/ass_fontconfig.h | 41 - libass/ass_library.c | 115 -- libass/ass_library.h | 41 - libass/ass_mp.c | 279 ----- libass/ass_mp.h | 60 - libass/ass_render.c | 2699 ------------------------------------------- libass/ass_types.h | 119 -- libass/ass_utils.c | 135 --- libass/ass_utils.h | 66 -- libass/mputils.h | 31 - pack.sh | 18 +- 23 files changed, 18 insertions(+), 6869 deletions(-) commit 81683a63319f609afcddaa651b3ecdd481d4a7db Author: Kovensky Date: Wed Jun 24 14:31:55 2009 -0300 Basic multiuser support MPlayer now tests to see if a "%appdata%\mplayer" folder exists. If it exists, then mplayer uses it instead of the "(.exe dir)\mplayer" for reading/writing config files. This new behavior is of course only triggered if the user makes a "mplayer" folder inside "%appdata%"; not making it maintains current behavior. This isn't the ideal support, but doing a better method would involve too much coding so I settled for this ;) get_path.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) commit 9cc19678e4a65bf9fafefcf306a029a278ba82b1 Author: Kovensky Date: Wed Jun 24 13:33:39 2009 -0300 Make the CPU detect line display by default There's not really a point in hiding it since it's helpful and non-spammy. cpudetect.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) commit ac1c56c1f447381690a4881720441fd32c3b9366 Author: Kovensky Date: Wed Jun 24 13:20:11 2009 -0300 Plug a memory leak libvo/video_out.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 626d081bc59e98fbcd46f50ffa7fa0cda21c38db Author: Kovensky Date: Wed Jun 24 13:19:59 2009 -0300 Remove one remaining debug printf libvo/vo_gl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 454f03c01199e9ce87d202f0313f961f88230773 Author: greg Date: Fri Jun 19 06:04:06 2009 +0200 ass_set_fonts: another API change. ass_mp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 084e344f21781bd372819997832198c4f39d069c Author: greg Date: Fri Jun 19 05:41:20 2009 +0200 ass_set_fonts: API changed ass_mp.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit 278756aabdccd7299920d6a575c7799dc9810b9c Author: greg Date: Thu Jun 18 15:22:43 2009 +0200 Wrap stuff in CONFIG_ASS, making MPlayer compile without ASS support. gui/cfg.c | 2 ++ gui/interface.c | 2 ++ libmpcodecs/vf_ass.c | 2 ++ libmpdemux/demux_mkv.c | 2 ++ libvo/vo_gl.c | 18 ++++++++++++++++-- libvo/vo_vdpau.c | 23 ++++++++++++++++++++++- 6 files changed, 46 insertions(+), 3 deletions(-) commit fa4dc1415e36ed260b9a2f0c130cd038e30bb457 Author: greg Date: Thu Jun 18 15:01:27 2009 +0200 Fix setting _ass variable in configure to correctly report whether libass support is enabled. configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit dac068e1ac91bbf9db9deff008545968f3fc9cf3 Author: greg Date: Thu Jun 18 14:55:02 2009 +0200 Move ass_mp helpers into root; delete libass directory. Makefile | 2 +- ass_mp.c | 278 ++++++++++++++++++++++++++++++++++++++++++++++++ ass_mp.h | 60 +++++++++++ command.c | 2 +- gui/cfg.c | 2 +- gui/interface.c | 2 +- libass/ass_mp.c | 278 ------------------------------------------------ libass/ass_mp.h | 60 ----------- libmpcodecs/vf_ass.c | 2 +- libmpcodecs/vf_vo.c | 2 +- libmpdemux/demux_mkv.c | 2 +- libmpdemux/demuxer.c | 2 +- libvo/vo_gl.c | 2 +- libvo/vo_vdpau.c | 2 +- mencoder.c | 2 +- mpcommon.c | 2 +- mplayer.c | 2 +- 17 files changed, 351 insertions(+), 351 deletions(-) commit 33cfba3a064b886eaad092f3733f13a7be821a04 Author: greg Date: Thu Jun 18 14:45:21 2009 +0200 Remove remaining libass/ass.h includes. gui/cfg.c | 1 - gui/interface.c | 1 - libvo/vo_vdpau.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) commit 679fd54c918bdaa31b25be53f6e4203f01b04ebe Author: greg Date: Wed Jun 17 22:33:36 2009 +0200 Support for standalone libass, dynamically linked. Makefile | 12 +- command.c | 1 - configure | 32 +- libass/ass.c | 1135 ------------------- libass/ass.h | 229 ---- libass/ass_bitmap.c | 337 ------ libass/ass_bitmap.h | 53 - libass/ass_cache.c | 386 ------- libass/ass_cache.h | 98 -- libass/ass_cache_template.c | 88 -- libass/ass_font.c | 369 ------ libass/ass_font.h | 60 - libass/ass_fontconfig.c | 518 --------- libass/ass_fontconfig.h | 41 - libass/ass_library.c | 115 -- libass/ass_library.h | 41 - libass/ass_mp.c | 7 +- libass/ass_mp.h | 4 +- libass/ass_render.c | 2617 ------------------------------------------- libass/ass_types.h | 119 -- libass/ass_utils.c | 135 --- libass/ass_utils.h | 66 -- libass/mputils.h | 31 - libmpcodecs/vf_ass.c | 1 - libmpcodecs/vf_vo.c | 1 - libmpdemux/demux_mkv.c | 1 - libmpdemux/demuxer.c | 1 - libvo/vo_gl.c | 1 - mencoder.c | 1 - mpcommon.c | 1 - mplayer.c | 1 - 31 files changed, 16 insertions(+), 6486 deletions(-) commit ccea8d3985ce53ee071912db534ccae3c723e105 Author: Kovensky Date: Wed Jun 24 06:36:38 2009 -0300 Use double_to_d16 instead of manual fixed-point conversion. libass/ass_render.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 2bd5bb317d5da073cc4ddc083a1124b04552e21a Author: Kovensky Date: Wed Jun 24 06:35:44 2009 -0300 Allow \blur animation, raise blur size limit, fix bitmap enlargement for blurring. libass/ass_bitmap.c | 2 +- libass/ass_render.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit e0d7dbdcf1018fe448fb9c2ea174a865cf20b76f Author: Kovensky Date: Wed Jun 24 06:35:13 2009 -0300 cbox calculation: Use INT_MAX/INT_MIN instead of some arbitrary high values. libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 3f4fa8a12b6e6bda01c1a9b813f0ce558e8cd102 Author: Kovensky Date: Wed Jun 24 06:34:21 2009 -0300 Disable PAR debug printfs, for now libass/ass_render.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 3184995f8e3ae52c0153f5ddf57c9b076920d731 Author: Kovensky Date: Wed Jun 24 06:33:52 2009 -0300 Some PAR fixup, still buggy libass/ass_render.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit a49037cbda3413296431519569a0cdea9a2ef2b2 Author: Kovensky Date: Wed Jun 24 06:33:15 2009 -0300 Use const where appropriate libass/ass_render.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) commit 891371dd54bb592901632d8ba2d349386590fb46 Author: Kovensky Date: Wed Jun 24 06:32:09 2009 -0300 WIP: PAR correction + Detect aspect ratio change properly. libass/ass.h | 2 +- libass/ass_render.c | 10 +++++++--- libmpcodecs/vf_ass.c | 2 +- libmpcodecs/vf_vo.c | 2 +- libvo/video_out.h | 1 + libvo/vo_gl.c | 3 +++ libvo/vo_vdpau.c | 2 ++ 7 files changed, 16 insertions(+), 6 deletions(-) commit 5e54bc5c61e5b5522b4f7cde636551b3c16a6288 Author: Kovensky Date: Wed Jun 24 06:28:36 2009 -0300 From greg's changes: Until the compiler-independent fix arrives, use packed structs for the hash keys libass/ass_cache.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 7f698056d3c4f5f1aa711a4608219277430bbcb9 Author: Kovensky Date: Wed Jun 24 06:12:24 2009 -0300 Revert "Import libass from greg's branch." This reverts commit 96b1e6f6d22812c40ca2fd9919e4605693b2151c. 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, 274 insertions(+), 241 deletions(-) commit 9d5814b2ecd4275700992d806af62fd538e8dc47 Author: Kovensky Date: Wed Jun 24 06:11:55 2009 -0300 Updated ffmpeg ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0889bfc4bc87fa271800f757cbf186ca0186a39e Author: Kovensky Date: Wed Jun 24 06:10:14 2009 -0300 Finally fix the crashes on preinit_libvo I need to remember that "copy+paste" can't necessarily be done by simple "cut+paste". libvo/video_out.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 7ba9acc9c39d053fbfa58e690c2934192601062b Author: Kovensky Date: Wed Jun 24 06:09:01 2009 -0300 Changed thread multiplier to 1. Tests by uau showed that 1 * cores is a much better equation than 1.25 * cores. By the way, 1.25 * cores was actually worse than 1.5 * cores but 1 * cores is better than either. libmpcodecs/vd_ffmpeg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7924781b04c2ac48248d3fc860f53e1b867a8396 Author: reimar Date: Wed Jun 24 08:13:52 2009 +0000 AVStream.language is deprecated, switch to av_get_metadata instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29386 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit bc8b79a37dbd54aeb4782738a566bb6353f3df4e Author: reimar Date: Wed Jun 24 08:06:46 2009 +0000 Move allocation to avoid a possible memleak if new_sh_audio fails. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29385 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 6a434d676b48dbdb05d81244d35f06685160e097 Author: reimar Date: Wed Jun 24 08:04:38 2009 +0000 Remove pointless stream count checks, new_sh_* already checks for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29384 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) commit 00be4423dadbece2f9682cef9aa3f0327fc4df53 Author: reimar Date: Wed Jun 24 07:49:04 2009 +0000 Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends can correctly display the languages of audio and subtitle tracks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29383 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)