commit c2e3ec42e29db856c5c8772cd5893ac3c429bec9 Author: Kovensky Date: Fri Jun 12 12:10:04 2009 -0300 Reduce number of threads automatically spawned 1.5 * cores appears to be an excessive number according to random internet people testing; reduced to 1.25 * cores. libmpcodecs/vd_ffmpeg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7dd0d23161c0432061b6d5ad50857fc94ae07624 Author: Kovensky Date: Fri Jun 12 12:09:02 2009 -0300 Fixed and applied mplayer-tcdump.patch -vf tcdump[=filename] Dump frame timecodes to a file, in the v2 external timecode file used by mkvmerge. With proper post-processing, this could be used to produce VFR files with mplayer/mencoder. Note that mencoder does not pass timestamps to the filter chain, and will not work with this filter. If none is given, the default filename is "timecodesv2.txt". DOCS/man/en/mplayer.1 | 8 ++++ Makefile | 1 + help/help_mp-en.h | 3 + libmpcodecs/vf.c | 2 + libmpcodecs/vf_tcdump.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 0 deletions(-) commit ea312d64162d37d781cd768bc6240f9f88db7a7b Author: Kovensky Date: Fri Jun 12 11:21:42 2009 -0300 Added patch mplayer-filmdint-vfr.patch Description from: http://lists.mplayerhq.hu/pipermail/mplayer-users/2006-October/063360.html mplayer-filmdint-vfr.patch add a new vfr parameter to the filmdint filter. When it is set to a non-zero value, filmdint should try to output frames with reasonable pts values, and should try not to drop frames unless they are telecine duplicates. This is still not perfect, and will need either a two-pass mode or frame buffering in the filter to fix. DOCS/man/en/mplayer.1 | 5 ++++ libmpcodecs/vf_filmdint.c | 51 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 1 deletions(-) commit 595ecc052cfb0fcc18ffe14fa0851a20dfb35828 Author: Kovensky Date: Fri Jun 12 11:00:20 2009 -0300 Better DVDNAV navigation Made -mouse-movements enabled on the default config file, needs -vo direct3d or -vo gl. This makes the selection on the DVD menu follow the mouse. Made Enter select the currently highlighted option on the DVD menu. Mouse click can't be used for that purpose since it already is used for pausing. cfg-mplayer-def.h | 7 +++++-- input/input.c | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) commit 2067d30a825d676558f492f5c0332ceef698f992 Author: Kovensky Date: Fri Jun 12 10:58:19 2009 -0300 Make -vo direct3d the default VO on Vista+ Since directdraw is deprecated, slower and breaks Aero, skip the -vo directx test if running on Vista+; the next VO tested is direct3d so it is used by default. Passing "-vo directx" or putting "vo=directx" in the config file has the expected result of using it instead of direct3d. libvo/video_out.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) commit 067cb2ad5cd4703679e2244e9dbe955969b74335 Author: Kovensky Date: Fri Jun 12 09:13:49 2009 -0300 Fix gitignore, it stopped ignoring .o files .gitignore | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 72890d2f6446181b0e99c63104f259f5d95b5404 Author: Kovensky Date: Fri Jun 12 09:12:02 2009 -0300 Make libmpeg2 the default MPEG-1/2 decoder. Some people (me included) were having performance problems when using libavcodec to decode video from DVDs. etc/codecs.conf | 74 +++++++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) commit d9f9edbb10b04a04560566b417a00ee0211dfee0 Author: Kovensky Date: Fri Jun 12 09:06:05 2009 -0300 Added a new "-lavdopts h264fast" option Disabled by default, but when specified it automatically sets "-lavdopts fast" for H.264 streams. It is safe to use when decoding most (all?) x264-produced streams. Note that while "-lavdopts fast" improves the playback speed of those streams, it might break horribly on some special cases. Also, it looks horrible on MPEG-2 video, thus this H.264-specific option was created. libmpcodecs/vd_ffmpeg.c | 6 +++++- options.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) commit 7a787528a186d05fe3f0a80e193453fe5830cf62 Author: Kovensky Date: Thu May 14 21:11:55 2009 -0300 Cleanup and reenable liba52 config.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 5cab607b948faa0d231f1c1d48a9b110c6fabdd9 Author: Kovensky Date: Thu May 14 21:11:02 2009 -0300 Restore the internal MKV and MPEG demuxers as the default ones The internal MKV demuxer is less buggy and has better ordered chapter support. libmpdemux/demux_lavf.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit e0d49822b30d75f924a26c952c83a951fbd92645 Author: Kovensky Date: Thu May 14 21:10:17 2009 -0300 Implement CPU count detection for linux libmpcodecs/vd_ffmpeg.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) commit 96d91d57f38a293907c8a976fd6fb40a5ed0e569 Author: Kovensky Date: Thu May 14 20:38:54 2009 -0300 Add internal libdvdnav and libdvdread4 I'm probably doing something wrong here ._. libdvdnav/.svn/dir-prop-base | 12 + libdvdnav/.svn/entries | 476 +++++ libdvdnav/.svn/format | 1 + libdvdnav/.svn/prop-base/FELLOWSHIP.map.svn-base | 9 + libdvdnav/.svn/prop-base/Makefile.am.svn-base | 9 + libdvdnav/.svn/prop-base/README.MAP.svn-base | 9 + libdvdnav/.svn/prop-base/dvdnav.c.svn-base | 9 + .../.svn/prop-base/dvdnav_internal.h.svn-base | 9 + libdvdnav/.svn/prop-base/highlight.c.svn-base | 9 + libdvdnav/.svn/prop-base/navigation.c.svn-base | 9 + libdvdnav/.svn/prop-base/read_cache.c.svn-base | 9 + libdvdnav/.svn/prop-base/read_cache.h.svn-base | 9 + libdvdnav/.svn/prop-base/remap.c.svn-base | 9 + libdvdnav/.svn/prop-base/remap.h.svn-base | 9 + libdvdnav/.svn/prop-base/searching.c.svn-base | 9 + libdvdnav/.svn/prop-base/settings.c.svn-base | 9 + libdvdnav/.svn/text-base/FELLOWSHIP.map.svn-base | 163 ++ libdvdnav/.svn/text-base/Makefile.am.svn-base | 34 + libdvdnav/.svn/text-base/README.MAP.svn-base | 105 + libdvdnav/.svn/text-base/dvdnav.c.svn-base | 1166 +++++++++++ .../.svn/text-base/dvdnav_internal.h.svn-base | 195 ++ libdvdnav/.svn/text-base/highlight.c.svn-base | 493 +++++ libdvdnav/.svn/text-base/navigation.c.svn-base | 196 ++ libdvdnav/.svn/text-base/read_cache.c.svn-base | 352 ++++ libdvdnav/.svn/text-base/read_cache.h.svn-base | 46 + libdvdnav/.svn/text-base/remap.c.svn-base | 266 +++ libdvdnav/.svn/text-base/remap.h.svn-base | 31 + libdvdnav/.svn/text-base/searching.c.svn-base | 626 ++++++ libdvdnav/.svn/text-base/settings.c.svn-base | 93 + libdvdnav/FELLOWSHIP.map | 163 ++ libdvdnav/Makefile.am | 34 + libdvdnav/README.MAP | 105 + libdvdnav/dvdnav.c | 1166 +++++++++++ libdvdnav/dvdnav/.svn/entries | 130 ++ libdvdnav/dvdnav/.svn/format | 1 + .../dvdnav/.svn/prop-base/dvd_types.h.svn-base | 13 + libdvdnav/dvdnav/.svn/prop-base/dvdnav.h.svn-base | 13 + .../dvdnav/.svn/prop-base/dvdnav_events.h.svn-base | 13 + .../dvdnav/.svn/text-base/dvd_types.h.svn-base | 275 +++ libdvdnav/dvdnav/.svn/text-base/dvdnav.h.svn-base | 686 ++++++ .../dvdnav/.svn/text-base/dvdnav_events.h.svn-base | 236 +++ libdvdnav/dvdnav/dvd_types.h | 275 +++ libdvdnav/dvdnav/dvdnav.h | 686 ++++++ libdvdnav/dvdnav/dvdnav_events.h | 236 +++ libdvdnav/dvdnav_internal.h | 195 ++ libdvdnav/highlight.c | 493 +++++ libdvdnav/navigation.c | 196 ++ libdvdnav/read_cache.c | 352 ++++ libdvdnav/read_cache.h | 46 + libdvdnav/remap.c | 266 +++ libdvdnav/remap.h | 31 + libdvdnav/searching.c | 626 ++++++ libdvdnav/settings.c | 93 + libdvdnav/vm/.svn/dir-prop-base | 12 + libdvdnav/vm/.svn/entries | 266 +++ libdvdnav/vm/.svn/format | 1 + libdvdnav/vm/.svn/prop-base/Makefile.am.svn-base | 9 + libdvdnav/vm/.svn/prop-base/decoder.c.svn-base | 9 + libdvdnav/vm/.svn/prop-base/decoder.h.svn-base | 9 + libdvdnav/vm/.svn/prop-base/vm.c.svn-base | 9 + libdvdnav/vm/.svn/prop-base/vm.h.svn-base | 9 + libdvdnav/vm/.svn/prop-base/vmcmd.c.svn-base | 9 + libdvdnav/vm/.svn/prop-base/vmcmd.h.svn-base | 9 + libdvdnav/vm/.svn/text-base/Makefile.am.svn-base | 16 + libdvdnav/vm/.svn/text-base/decoder.c.svn-base | 784 +++++++ libdvdnav/vm/.svn/text-base/decoder.h.svn-base | 109 + libdvdnav/vm/.svn/text-base/vm.c.svn-base | 1910 +++++++++++++++++ libdvdnav/vm/.svn/text-base/vm.h.svn-base | 180 ++ libdvdnav/vm/.svn/text-base/vmcmd.c.svn-base | 545 +++++ libdvdnav/vm/.svn/text-base/vmcmd.h.svn-base | 28 + libdvdnav/vm/Makefile.am | 16 + libdvdnav/vm/decoder.c | 784 +++++++ libdvdnav/vm/decoder.h | 109 + libdvdnav/vm/vm.c | 1910 +++++++++++++++++ libdvdnav/vm/vm.h | 180 ++ libdvdnav/vm/vmcmd.c | 545 +++++ libdvdnav/vm/vmcmd.h | 28 + libdvdread4/.svn/dir-prop-base | 12 + libdvdread4/.svn/entries | 507 +++++ libdvdread4/.svn/format | 1 + libdvdread4/.svn/prop-base/Makefile.am.svn-base | 9 + libdvdread4/.svn/prop-base/bitreader.c.svn-base | 9 + libdvdread4/.svn/prop-base/bswap.h.svn-base | 9 + libdvdread4/.svn/prop-base/dvd_input.c.svn-base | 9 + libdvdread4/.svn/prop-base/dvd_input.h.svn-base | 9 + libdvdread4/.svn/prop-base/dvd_reader.c.svn-base | 9 + libdvdread4/.svn/prop-base/dvd_udf.c.svn-base | 9 + .../.svn/prop-base/dvdread_internal.h.svn-base | 9 + libdvdread4/.svn/prop-base/ifo_print.c.svn-base | 9 + libdvdread4/.svn/prop-base/ifo_read.c.svn-base | 9 + libdvdread4/.svn/prop-base/md5.c.svn-base | 9 + libdvdread4/.svn/prop-base/md5.h.svn-base | 9 + libdvdread4/.svn/prop-base/nav_print.c.svn-base | 9 + libdvdread4/.svn/prop-base/nav_read.c.svn-base | 9 + libdvdread4/.svn/text-base/Makefile.am.svn-base | 19 + libdvdread4/.svn/text-base/bitreader.c.svn-base | 116 + libdvdread4/.svn/text-base/bswap.h.svn-base | 106 + libdvdread4/.svn/text-base/dvd_input.c.svn-base | 365 ++++ libdvdread4/.svn/text-base/dvd_input.h.svn-base | 50 + libdvdread4/.svn/text-base/dvd_reader.c.svn-base | 1272 +++++++++++ libdvdread4/.svn/text-base/dvd_udf.c.svn-base | 990 +++++++++ .../.svn/text-base/dvdread_internal.h.svn-base | 33 + libdvdread4/.svn/text-base/ifo_print.c.svn-base | 1205 +++++++++++ libdvdread4/.svn/text-base/ifo_read.c.svn-base | 2208 ++++++++++++++++++++ libdvdread4/.svn/text-base/md5.c.svn-base | 407 ++++ libdvdread4/.svn/text-base/md5.h.svn-base | 161 ++ libdvdread4/.svn/text-base/nav_print.c.svn-base | 248 +++ libdvdread4/.svn/text-base/nav_read.c.svn-base | 265 +++ libdvdread4/Makefile.am | 19 + libdvdread4/bitreader.c | 116 + libdvdread4/bswap.h | 106 + libdvdread4/dvd_input.c | 365 ++++ libdvdread4/dvd_input.h | 50 + libdvdread4/dvd_reader.c | 1272 +++++++++++ libdvdread4/dvd_udf.c | 990 +++++++++ libdvdread4/dvdread/.svn/entries | 334 +++ libdvdread4/dvdread/.svn/format | 1 + .../dvdread/.svn/prop-base/bitreader.h.svn-base | 13 + .../dvdread/.svn/prop-base/dvd_reader.h.svn-base | 13 + .../dvdread/.svn/prop-base/dvd_udf.h.svn-base | 13 + .../dvdread/.svn/prop-base/ifo_print.h.svn-base | 13 + .../dvdread/.svn/prop-base/ifo_read.h.svn-base | 13 + .../dvdread/.svn/prop-base/ifo_types.h.svn-base | 13 + .../dvdread/.svn/prop-base/nav_print.h.svn-base | 13 + .../dvdread/.svn/prop-base/nav_read.h.svn-base | 13 + .../dvdread/.svn/prop-base/nav_types.h.svn-base | 13 + .../dvdread/.svn/text-base/bitreader.h.svn-base | 41 + .../dvdread/.svn/text-base/dvd_reader.h.svn-base | 277 +++ .../dvdread/.svn/text-base/dvd_udf.h.svn-base | 62 + .../dvdread/.svn/text-base/ifo_print.h.svn-base | 28 + .../dvdread/.svn/text-base/ifo_read.h.svn-base | 229 ++ .../dvdread/.svn/text-base/ifo_types.h.svn-base | 750 +++++++ .../dvdread/.svn/text-base/nav_print.h.svn-base | 52 + .../dvdread/.svn/text-base/nav_read.h.svn-base | 53 + .../dvdread/.svn/text-base/nav_types.h.svn-base | 248 +++ libdvdread4/dvdread/bitreader.h | 41 + libdvdread4/dvdread/dvd_reader.h | 277 +++ libdvdread4/dvdread/dvd_udf.h | 62 + libdvdread4/dvdread/ifo_print.h | 28 + libdvdread4/dvdread/ifo_read.h | 229 ++ libdvdread4/dvdread/ifo_types.h | 750 +++++++ libdvdread4/dvdread/nav_print.h | 52 + libdvdread4/dvdread/nav_read.h | 53 + libdvdread4/dvdread/nav_types.h | 248 +++ libdvdread4/dvdread_internal.h | 33 + libdvdread4/ifo_print.c | 1205 +++++++++++ libdvdread4/ifo_read.c | 2208 ++++++++++++++++++++ libdvdread4/md5.c | 407 ++++ libdvdread4/md5.h | 161 ++ libdvdread4/nav_print.c | 248 +++ libdvdread4/nav_read.c | 265 +++ 151 files changed, 37656 insertions(+), 0 deletions(-) commit 4e245a694dd0eee6df52bffd4ca4ef7edbac4f68 Author: Kovensky Date: Thu May 14 20:38:24 2009 -0300 Added some .txt files I use for changelogs to .gitignore .gitignore | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 7a40ae2421b99dabafa4f37a4c15d159907b71c5 Author: Kovensky Date: Thu May 14 20:37:12 2009 -0300 Undo some more "10l"s in configure Update build script config.sh | 4 ++-- configure | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) commit ba785e7603c2d044a0d058a0333c5b753820a0a0 Author: Kovensky Date: Thu May 14 20:21:37 2009 -0300 Revert one wrong change configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d9fa53f393faa13566a2ec79dd0c8d90ed302d41 Author: Kovensky Date: Thu May 14 20:18:08 2009 -0300 Remove some uneeded CFLAGS / LDFLAGS config.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 932ee16307e268ad0ded849c793d6038d28236b7 Author: Kovensky Date: Thu May 14 20:15:42 2009 -0300 Make a define in configure more correct. configure | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 5adc7f5100ecfed8cc1f5435c994b87a3de39404 Author: Kovensky Date: Sat May 9 09:16:06 2009 -0300 Whitespace configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit da18b25a029d3471bc03c63dd05df9f4d871e8f9 Author: Kovensky Date: Sat Apr 25 08:42:25 2009 -0300 Fix another compiling failure... libass/ass_fontconfig.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 925286edba6a632640157bb303d26502929f9496 Author: Kovensky Date: Sat Apr 25 08:41:38 2009 -0300 Also force threads to 1 when decoding MPEG-2/MPEG-1 video. Fixes several crashes / glitches with those videos. libmpcodecs/vd_ffmpeg.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 2342fbb27e3f67fadf32cbba63971039842da4ea Author: Kovensky Date: Sat Apr 25 08:41:12 2009 -0300 Prefer libmad for mp3/mp2 decoding. etc/codecs.conf | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) commit 8533ab96ba26a49edd897eb972aa4c350e32744e 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 a459b21d39e375fec6565abb4faec9a0b30b6ac1 Author: Kovensky Date: Sun Mar 29 23:08:28 2009 -0300 Fix LZO symbol breakage yet again... libmpcodecs/vd_lzo.c | 4 ++-- libmpdemux/demux_mkv.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) commit 15a357cf3594a645fd1646dd09ccc6d63ab18734 Author: Kovensky Date: Sun Mar 29 21:35:33 2009 -0300 Updated for new build environment. config.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 3e56e8b824dc2306508bf36846dfba38fce7d473 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 611449f11ff2895283805fe21e66df6c763f920e 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 221d525e272732e5ce7c01991d7daf729dea013c 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 013b5f0d255cfeecdbacbe0557060c69ee6ec759 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 b46cc5e28fb9204ada62df8c5cda6441ed1ac415 Author: Kovensky Date: Wed Mar 4 22:55:01 2009 +0900 Fix pthreads detection configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 37720b8ccb59c11a804ba5e67960313fedc4c6f1 Author: Kovensky Date: Wed Mar 4 19:33:27 2009 +0900 Compilation fixes libmpcodecs/native/nuppelvideo.c | 114 ++++++++++++++++++++++++++++++++++++++ libmpcodecs/vd_lzo.c | 2 +- libmpdemux/demux_mkv.c | 12 ++-- 3 files changed, 121 insertions(+), 7 deletions(-) commit 1b5cfc388b4f63b2b63a5ef17eef7e4df0b64b5f 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 9656aa49efeb09a1e47f6ef6b7dbd7fdb4e77f5a 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 7c22bdfdfa8f3798645efa39aba2ae6cbcbb706a 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 | 11 ++++++ configure | 26 ++++++++++++--- defaultopts.c | 2 +- etc/codecs.conf | 14 ++++++++ etc/mplayer.ico | Bin 5694 -> 74116 bytes ffmpeg | 2 +- 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 ++ 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, 385 insertions(+), 50 deletions(-) commit cb6df853561c1a40b069fbd9ec9452dc0745cddf Author: Uoti Urpala Date: Sun May 31 16:06:38 2009 +0300 Update FFmpeg-mt submodule ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5c85f6978b5998f3558f1038bb705a71aa11e1e5 Merge: 26b1523... f48840f... Author: Uoti Urpala Date: Sat May 30 19:31:37 2009 +0300 Merge branch 'master' into mt commit 26b1523d35565aef6081836110cb079ccc5a3cdd Author: Uoti Urpala Date: Sat May 30 19:28:04 2009 +0300 Update FFmpeg-mt submodule ffmpeg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f48840f8204d754026350c046b5b0ab03a9c8b80 Author: Uoti Urpala Date: Fri May 22 02:22:18 2009 +0300 Fix ordered chapter pruning of redundant timeline parts Code that was supposed to merge two timeline parts if the second one started exactly where the first one stopped didn't work because it mixed timestamps in different units (I had changed the units of some variables after originally writing that code but forgotten to update it). As a result of the bug there were unnecessary part switches, but it was unlikely to cause any serious problems. mplayer.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)