commit 1c6846f310cde01707d12173152bc979da7c1d5c Author: Kovensky Date: Thu Feb 11 23:07:36 2010 -0300 Move and reword the threads=0 hack Fixes playback of MPEG-2 files when using threads=0. libmpcodecs/vd_ffmpeg.c | 59 ++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 31 deletions(-) commit 9b70e77c64ce654a28188095a80676d72311f05f Author: Kovensky Date: Thu Feb 11 16:08:23 2010 -0300 Added Windows screensaver disabling Disables the windows screensaver unconditionally for now. Periodically calls a function that resets the screensaver countdown timer. This change makes MPlayer ABI-incompatible with pre-win2000 OSes. mplayer.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 860f6ef029fe67d1e358a0de4c1cd3f79e6fac8a Merge: e4e83af e187de8 Author: Kovensky Date: Fri Feb 5 20:19:12 2010 -0300 Update mplayer sources commit e4e83af732d2e4ed4c293e234f9db8a8b56dfb8d Author: Kovensky Date: Fri Feb 5 20:08:22 2010 -0300 Fix missed chunk on GL_WIN32 rename GL_WIN32 was renamed to CONFIG_GL_WIN32, some windows code was left disabled when it should be enabled. Fixes the code that chose VO based on windows version. libvo/video_out.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e187de88a1ce7587827824ef9c16707dfb15718b Author: Uoti Urpala Date: Fri Feb 5 20:13:33 2010 +0200 vo_vdpau: make queuing future frame flips adjustable Add -vo vdpau suboptions "queuetime_windowed" and "queuetime_fs" to specify the maximum number of milliseconds how far into the future a frame flip can be queued using the VDPAU presentation queue functionality. The intended main use of these options is to allow disabling use of the queuing feature on systems where using it causes choppiness in other graphics behavior (this is an NVIDIA driver issue; the video itself isn't affected). DOCS/man/en/mplayer.1 | 15 +++++++++++++++ libvo/video_out.h | 2 ++ libvo/vo_vdpau.c | 8 ++++++++ mplayer.c | 6 ++---- 4 files changed, 27 insertions(+), 4 deletions(-) commit 60c518022d73fd3962e32dcaef1d48e50c173967 Author: Kovensky Date: Fri Feb 5 01:09:25 2010 -0300 Use SHGetSpecialFolderPath instead of %appdata% This is the Right Thing(tm). Cosmetics. get_path.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) commit dae9cd7b4f06d5afe34a4154647f6de94fc3f7c4 Author: Kovensky Date: Fri Feb 5 00:39:49 2010 -0300 Disable console colors by default They can still be enabled by uncommenting the option on the config file. cfg-mplayer-def.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1b4cfeba1ecc1526e3ed646d294d56e3c416bcf2 Author: Kovensky Date: Fri Feb 5 00:34:12 2010 -0300 Fix mencoder build Cosmetics mencoder.c | 29 ++++++++++++++--------------- mplayer.c | 5 ++--- 2 files changed, 16 insertions(+), 18 deletions(-) commit 68b8a56f0997b1709ed7ac6264db4fdd7fc4ceb2 Author: Kovensky Date: Thu Feb 4 20:27:01 2010 -0300 Update dvdread and dvdnav to r1189 libdvdnav/remap.c | 22 +---- libdvdnav/vm/vm.c | 24 +++-- libdvdread4/dvd_reader.c | 210 +++++++++++++++++++++++++++++++++++--- libdvdread4/dvdread/dvd_reader.h | 36 +++++++ libdvdread4/dvdread_internal.h | 4 +- libdvdread4/ifo_read.c | 4 +- 6 files changed, 250 insertions(+), 50 deletions(-) commit cddc8db614d2c626f6162160b6efd112b915920d Author: Kovensky Date: Thu Feb 4 18:55:05 2010 -0300 Try gmake before make Fixes BSD. build/clean | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 66d795096cc7b43585b503f2ac36786225556aea Author: Kovensky Date: Thu Feb 4 18:53:47 2010 -0300 Remove HAVE_MATRIXVIEW references The correct flag is CONFIG_MATRIXVIEW. configure | 13 ------------- libvo/video_out.c | 3 --- 2 files changed, 0 insertions(+), 16 deletions(-) commit 23381d276fbe7ead4cfd9fef4e77031591f24f12 Merge: a682529 9118a5d Author: Kovensky Date: Thu Feb 4 16:48:17 2010 -0300 Update mplayer, ffmpeg and libass commit 9118a5dd02c365e51a9f49dd34469dd7c26b89c7 Author: Uoti Urpala Date: Sun Jan 31 20:16:19 2010 +0200 ad_faad: move message "input bitrate missing" to MSGL_V The input bitrate isn't needed for anything in normal playback, so there is no reason to print a warning message for practically all files using the decoder. libmpcodecs/ad_faad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 1872284cdc75c6239e7739246d514c19684e5d85 Author: Uoti Urpala Date: Sun Jan 31 02:01:12 2010 +0200 VO: remove directfb from autoselected VOs VO_directfb can call exit() if initialization fails. This makes MPlayer exit without cleanup if autoselection tries it. This can be seen for example by running something like this in an X terminal: DISPLAY=foo mplayer file.mkv The easiest fix for this is to remove directdb from the list of autoselected VOs. The console VOs have enough problems that people who want to use them should know what they're doing anyway. libvo/video_out.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 8c225fbe0dffc1e0dbaa2e9d4855761e66b020ab Author: Uoti Urpala Date: Sat Jan 30 23:33:31 2010 +0200 codecs.conf: stop trying mpegpes first for MPEG-1/2 Setups which would benefit from mpegpes are rare today, and trying it first produces misleading error messages when trying to play any MPEG-1/2 file. etc/codecs.conf | 61 +++++++++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 31 deletions(-) commit 4a3de78aaedc0307525fa1375f10ce84567ccda4 Author: Uoti Urpala Date: Thu Jan 28 17:17:54 2010 +0200 demux_mkv: remove incorrect error message about compression The demuxer still printed a message about "unknown/unsupported compression algorithm (3)" even though that is now supported and in fact played fine. libmpdemux/demux_mkv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 42244dd2a46ff0e14c6192fa7d8fdb01d033befa Author: Uoti Urpala Date: Thu Jan 28 01:12:34 2010 +0200 x11_common: always free x11 context struct on exit Previously it was not freed if no X11 display had been opened (for example -vo null). libvo/x11_common.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) commit c710c5ee504530eeb7ef7c73f6665fdb291dd206 Merge: d84685c 55c50b3 Author: Uoti Urpala Date: Thu Jan 28 00:56:26 2010 +0200 Merge branch 'matroska' commit d84685ce13c7b31689b257e44b780373c91f8d32 Merge: 79ab199 9b6b3ff Author: Uoti Urpala Date: Thu Jan 28 00:54:08 2010 +0200 Merge svn changes up to r30448 commit 79ab199322a7070c489eca842e472d15be02412c Merge: 6ece23f 01a39f2 Author: Uoti Urpala Date: Thu Jan 28 00:38:03 2010 +0200 Ignore svn changes up to r30440 Two not relevant to current code in git and r30440 was already fixed last year. commit 6ece23f1b12e80960c66a8596a3c927bf7ee8621 Merge: 167322f b1f3c59 Author: Uoti Urpala Date: Thu Jan 28 00:37:32 2010 +0200 Merge svn changes up to r30437 commit 167322fa33b6efbc1f1d681327b4a928ba0b706a Merge: 42a87fc 71dcc05 Author: Uoti Urpala Date: Thu Jan 28 00:26:22 2010 +0200 Ignore svn change r30420 This commit isn't quite right - most of this functionality doesn't belong at the demuxer level, and cannot be implemented correctly there. Instead for example the command.c function calling demuxer_set_angle() should call a higher-level reset function that does some of the stuff that current mplayer.c seek() does, plus some things moved from the existing demuxer layer code. I'll leave the implementation for later though. commit 9b6b3ff08c3f0c5151a379cabd08cfb0fa309f79 Author: attila Date: Wed Jan 27 22:22:50 2010 +0000 Stopping maintainership for -vo (x)mga git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30448 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/MAINTAINERS | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 1a7b69f7f2e670b7c09baddbdd619db72091e647 Author: reimar Date: Wed Jan 27 19:45:16 2010 +0000 Simplify and correct loop condition, also avoids a compiler warning for unused result. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30447 b3059339-0415-0410-9bf9-f77b7e298cf2 gui/skin/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 4526f4da65bc00d61d242a1af959529ea4555caa Author: reimar Date: Wed Jan 27 19:42:24 2010 +0000 Fix newline removal code that might read and write out of bounds. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30446 b3059339-0415-0410-9bf9-f77b7e298cf2 gui/skin/font.c | 4 ++-- gui/skin/skin.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit d1ec4a57bab7eb2cb1cb44b9e8951c7fead025df Author: reimar Date: Wed Jan 27 19:15:49 2010 +0000 Make mp3lib the default MP3 decoder again, it is a good bit faster on standard desktop hardware. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30445 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) commit 4c211d8851d21b05af89c81375784970348da80b Author: reimar Date: Wed Jan 27 18:23:19 2010 +0000 Declare variable closer to where it is used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30444 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) commit 882ce0cd5e26f1b8d4360ba2a390670cc1f4ca6b Author: reimar Date: Wed Jan 27 18:21:27 2010 +0000 Remove a useless global variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30443 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) commit 5f326498f7e2de70361785baf4516e54dd2294ab Author: reimar Date: Wed Jan 27 18:16:41 2010 +0000 Do not needlessly make local variable static. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30442 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 051d3210c7fd77c59e031e6354ed01be1a8deb17 Author: reimar Date: Wed Jan 27 18:11:15 2010 +0000 Remove useless initializers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30441 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 01a39f2fc3528481374a8a47e138b622e419f67b Author: reimar Date: Wed Jan 27 18:10:07 2010 +0000 Do not needlessly use (file-)global variables. Since they also were initialized to a value and non-constant (changed by ALSA) this might actually have caused bugs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30440 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) commit 55c50b3f9931095f7420ce6932329eceaf81d347 Author: Uoti Urpala Date: Tue Jan 26 19:40:07 2010 +0200 demux_mkv: improve compression handling Add support for compression algorithm 3 (header stripping). Rewrite some of the code related to handling manyfold compression, it was just completely broken (I don't have samples to test whether it actually works now). libmpdemux/demux_mkv.c | 60 +++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 26 deletions(-) commit 1b22101c77edf5e74b5ada3758930a6d6354720e Author: Uoti Urpala Date: Tue Jan 26 18:15:02 2010 +0200 demux_mkv: use new EBML parser to read all track headers libmpdemux/demux_mkv.c | 362 ++++++++++++++++++------------------------------ 1 files changed, 135 insertions(+), 227 deletions(-) commit 2fd4dc45de77f87f46eaca4aaf5f233317723018 Author: Uoti Urpala Date: Tue Jan 26 16:56:44 2010 +0200 demux_mkv: handle compressed text subtitles The decompression step wasn't run at all for subtitle types other than vobsub. Fix that. Remove a "!mkv_d->v_skip_to_keyframe" test from the subtitle handling - for properly timed subtitles unnecessary packets do little harm, and the subtitles could stay visible. libmpdemux/demux_mkv.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 16ee636a58c7e0eb1e44b85681ea61fd692fef7f Author: Uoti Urpala Date: Tue Jan 26 16:38:39 2010 +0200 demux_mkv: don't print errors for 0-size zlib decoding Allow decoding a 0-sized buffer with zlib algorithm to produce 0-sized output. Fixes spurious errors reported with subtitle tracks marked to use compression for track private data without having any such data. libmpdemux/demux_mkv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 51fc1f839b301537fae21ab6c3a737a5622bd682 Author: Uoti Urpala Date: Tue Jan 26 16:05:49 2010 +0200 demux_mkv: use new EBML parser to read TrackEncodings libmpdemux/demux_mkv.c | 218 +++++++++++++++--------------------------------- 1 files changed, 67 insertions(+), 151 deletions(-) commit 7ecafde34f206b713eb9ceb174415966ba30b64a Author: Uoti Urpala Date: Tue Jan 26 14:55:06 2010 +0200 demux_mkv: use new EBML parser to read Video element libmpdemux/demux_mkv.c | 94 +++++++++++++++++------------------------------- 1 files changed, 33 insertions(+), 61 deletions(-) commit db41501f230f8f29c1c32584bc4d12dfc87ce498 Author: Uoti Urpala Date: Tue Jan 26 14:41:07 2010 +0200 demux_mkv: use new EBML parser to read Audio element libmpdemux/demux_mkv.c | 66 ++++++++++++++++-------------------------------- libmpdemux/ebml.c | 3 +- libmpdemux/ebml.h | 1 + 3 files changed, 25 insertions(+), 45 deletions(-) commit fc907b7488571ceee0012baf4e6f753c423b122e Author: Uoti Urpala Date: Tue Jan 26 14:06:49 2010 +0200 demux_mkv: use new EBML parser for Info parsing libmpdemux/demux_mkv.c | 82 +++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 52 deletions(-) commit a07cfb35d3c516830dda851f1c6d371e229c69b1 Author: Uoti Urpala Date: Tue Jan 26 13:53:27 2010 +0200 demux_mkv: remove pointless 'long double' use There was no remaining reason to use this type. The variables were assigned values with plain double precision anyway. libmpdemux/demux_mkv.c | 6 +++--- libmpdemux/ebml.c | 4 ++-- libmpdemux/ebml.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) commit 6e7531c4beb644fd161f7f370b1513d2ec243924 Author: Uoti Urpala Date: Tue Jan 26 13:39:33 2010 +0200 demux_mkv: use new EBML parser for chapter parsing libmpdemux/demux_mkv.c | 299 ++++++++++++++++-------------------------------- 1 files changed, 101 insertions(+), 198 deletions(-) commit 8c0e224097ad01ad85841c62d493fd3033c2702e Author: Uoti Urpala Date: Mon Jan 25 19:42:37 2010 +0200 demux_mkv: use new EBML parser for attachment parsing libmpdemux/demux_mkv.c | 101 ++++++++++-------------------------------------- 1 files changed, 21 insertions(+), 80 deletions(-) commit 49b80fe6b45dad5b04d3903987b287f957b94259 Author: Uoti Urpala Date: Tue Jan 26 03:31:31 2010 +0200 demux: take chapter/attachment name strings without 0-termination Change the demuxer_add_attachment() and demuxer_add_chapter() functions to take a length argument for various name strings, so those strings do not need to be 0-terminated. This will make it easier to directly pass demuxed data without first making a copy just to add 0-termination. Also allocate the struct demuxer data structures for attachments and chapters with talloc. libmpdemux/demux_lavf.c | 6 ++-- libmpdemux/demux_mkv.c | 5 ++- libmpdemux/demuxer.c | 57 +++++++++++++++++++--------------------------- libmpdemux/demuxer.h | 9 ++++--- 4 files changed, 35 insertions(+), 42 deletions(-) commit 298808cddc40b66dde9578ec8abb71094357c3ce Author: Uoti Urpala Date: Mon Jan 25 13:27:35 2010 +0200 demux_mkv: don't stop playback on non-Cluster elements The main demuxing code signaled EOF and stopped playback if it hit a top-level element other than Cluster. There are files with other elements between Cluster ones, at least repeated copies of Track headers. Change the code to skip any non-Cluster element and only stop searching on real file EOF. libmpdemux/demux_mkv.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit d8a6af2980e7ecfee0a3e53896f4617d981ce56c Author: Uoti Urpala Date: Mon Jan 25 13:19:09 2010 +0200 demux_mkv: improve Cues parsing Rewrite Cues parsing code using the new EBML parser. The new version fixes a hang in some cases of incomplete files and supports a cuepoint specifying multiple tracks per timecode (the previous code added an index entry for the track mentioned last only). libmpdemux/demux_mkv.c | 83 ++++++++++------------------------------------- 1 files changed, 18 insertions(+), 65 deletions(-) commit f90e9a86d133a32d5b15b5ee3472f1a49cabc206 Author: Uoti Urpala Date: Mon Jan 25 12:37:42 2010 +0200 demux_mkv: support reading all headers based on SeekHead Restructure the code reading toplevel header elements and rewrite the SeekHead parsing code using the new EBML parser. Now every type of header element is read anywhere in the file if there's a SeekHead entry pointing to it. The new SeekHead parsing code has more diagnostic output in case of errors. libmpdemux/demux_mkv.c | 302 ++++++++++++++++++++++++------------------------ 1 files changed, 150 insertions(+), 152 deletions(-) commit 8b0726b28a3d633a89dc660f2563266a0dcca69b Author: Uoti Urpala Date: Mon Jan 25 02:43:27 2010 +0200 demux_mkv: use new EBML parser for file header libmpdemux/demux_mkv.c | 34 +++++++++++++++++++--- libmpdemux/ebml.c | 73 ------------------------------------------------ libmpdemux/ebml.h | 1 - 3 files changed, 29 insertions(+), 79 deletions(-) commit 5f631d1c0834927a945d72dc8e9abd77b2e6b154 Author: Uoti Urpala Date: Mon Jan 25 00:55:11 2010 +0200 matroska: add new parsing code Add a new EBML parser implementation that should allow significant improvements to the Matroska demuxer. The new parsing code is not actually used yet by the demuxer. The only changes to existing code in this commit are to generate the MATROSKA_ID_* / EBML_ID_* macro definitions from the new implementation and to rename some of them (the new implementation uses names matching the official Matroska spec). The main parser implementation is added in ebml.c. There are two new generated files, ebml_defs.c and ebml_types.h, that contain definitions of EBML elements. Those are generated by the new script TOOLS/matroska.py. There's a new Makefile target "generated_ebml" that run the script to refresh the content of the generated files. Makefile | 4 +- TOOLS/matroska.py | 397 +++++++++++++++++++++++++++++++++++++++++++ libmpdemux/demux_mkv.c | 40 +++--- libmpdemux/ebml.c | 400 ++++++++++++++++++++++++++++++++++++++++++- libmpdemux/ebml.h | 191 +++++---------------- libmpdemux/ebml_defs.c | 382 +++++++++++++++++++++++++++++++++++++++++ libmpdemux/ebml_types.h | 433 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 1675 insertions(+), 172 deletions(-) commit 42a87fc6113bc14bbd14681e209a8c91c4b87a90 Author: Grigori Goronzy Date: Mon Jan 25 13:57:32 2010 +0100 Disable libass fallbacks for fontconfig < 2.4.2 libass doesn't support fontconfig < 2.4.2 so fallbacks for these ancient versions aren't needed anymore. Also update the man page (English, German) to reflect the change. Additionally note that -embeddedfonts controls the use of ASS script embedded fonts too. -embeddedfonts is now always enabled by default. Fonts are never extracted into a directory anymore but passed to libass via memory. DOCS/man/de/mplayer.1 | 14 +++----------- DOCS/man/en/mplayer.1 | 10 ++-------- ass_mp.c | 8 ++------ ass_mp.h | 2 +- cfg-common-opts.h | 4 ++-- mplayer.c | 2 +- 6 files changed, 11 insertions(+), 29 deletions(-) commit 7be89f904dc3e6daa001e17e66a7a6edbff39c22 Author: stefano Date: Wed Jan 27 00:25:23 2010 +0000 Rename swscale-example to swscale-test, to better reflect the intended use of the program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30439 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/Makefile | 3 +- libswscale/swscale-example.c | 260 ------------------------------------------ libswscale/swscale-test.c | 260 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 261 insertions(+), 262 deletions(-) commit cc95355a0a4d88306e4af0323818e694718a8e8e Author: reimar Date: Tue Jan 26 21:08:01 2010 +0000 Remove ds_fill_buffer calls from demux_resync, they cause issues at least with the ASF demuxer (seek seems to end up right after the keyframe?) and seem to have no purpose anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30438 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit b1f3c590c79534efb970220d4c186063adb225aa Author: reimar Date: Tue Jan 26 18:19:57 2010 +0000 Enable parsing for ASF audio streams. This is necessary to use the ffmp2 decoder with dvr-ms files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30437 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/asfheader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit d83fb575cf06d8921758ce1fe2b20320a93d159b Author: reimar Date: Tue Jan 26 18:15:58 2010 +0000 Add an option to cropdetect to periodically reset the detected area. Patch by [quetschke scytek de] with modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30436 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 9 ++++++++- libmpcodecs/vf_cropdetect.c | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) commit 156399b7aa25e5a8c39563fc6435de21f41dd655 Author: michael Date: Tue Jan 26 08:03:28 2010 +0000 Use isAnyRGB() where possible git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30435 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 13 ++++++------- libswscale/swscale_template.c | 2 +- libswscale/utils.c | 9 ++++----- 3 files changed, 11 insertions(+), 13 deletions(-) commit 60b76a958faee93d45e33b68b2ac9914448aa04a Author: michael Date: Tue Jan 26 08:01:50 2010 +0000 Add 3 more RGB makros that allow specifying RGB in bytes and any rgb/bgr. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30434 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 378e6bf1923e4354b7e514a3117ff2de632765b1 Author: michael Date: Tue Jan 26 07:40:14 2010 +0000 Rename isRGB() and isBGR() as their meaning is confusing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30433 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 22 +++++++++++----------- libswscale/swscale_internal.h | 4 ++-- libswscale/swscale_template.c | 2 +- libswscale/utils.c | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) commit 2cded4ef2cb2c2333ca441129a4b307c5837197b Author: stefano Date: Mon Jan 25 22:46:09 2010 +0000 Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks, slightly simplify code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30432 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/utils.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit e28e4a1b157bd0e9620fcff956d713a9921f506c Merge: 560acfd 213092c Author: Uoti Urpala Date: Mon Jan 25 15:59:53 2010 +0200 Merge svn changes up to r30419 commit 560acfd0407c757e17bf72b490687d4947b05675 Merge: 4ebf007 134976e Author: Uoti Urpala Date: Mon Jan 25 15:37:54 2010 +0200 Ignore svn changes up to r30385 libswscale / internal FFmpeg build stuff. commit 4ebf0075806ccf2bdde276a4e56eac41c7e350c4 Merge: efd25f7 c2ba58a Author: Uoti Urpala Date: Mon Jan 25 15:36:38 2010 +0200 Merge svn changes up to r30375 commit efd25f7811b232ae2b1899ca0fee6fd598837b9f Merge: ff2df2a cd2dbe5 Author: Uoti Urpala Date: Mon Jan 25 15:19:03 2010 +0200 Ignore svn changes up to r30324 Internal FFmpeg build stuff. commit ff2df2ac545bb36ca4c1d2f872236cdf0a7218ab Merge: 8dd016c 5f5462c Author: Uoti Urpala Date: Mon Jan 25 15:17:50 2010 +0200 Merge svn changes up to r30322 commit 8dd016c538340e4a50628eedae0561d45c95ef6b Merge: 69fe252 0bd2e79 Author: Uoti Urpala Date: Mon Jan 25 15:09:19 2010 +0200 Ignore svn changes up to r30306 libswcale / internal FFmpeg build stuff. commit 69fe2522f8c2a04eda112eee6319ca2e85d7038b Merge: 9436e04 1cda8b0 Author: Uoti Urpala Date: Mon Jan 25 15:04:07 2010 +0200 Merge svn changes up to r30301 commit 9436e0452fad48e671d7320cb18c588655f3d230 Merge: 36dae0e 4ecd474 Author: Uoti Urpala Date: Mon Jan 25 14:56:15 2010 +0200 Ignore svn change r30269 Useless internal FFmpeg build stuff. commit 36dae0ee4485ec52cf727c33679ed315cd3d9c0a Merge: deb9536 af6f08c Author: Uoti Urpala Date: Mon Jan 25 14:55:14 2010 +0200 Merge svn changes up to r30268 commit deb95362577935bec836ffd1f2669f424c5d34c8 Merge: 0f72485 f10f9b5 Author: Uoti Urpala Date: Mon Jan 25 14:52:59 2010 +0200 Skip svn change r30265 (default mp3 decoder change) The FFmpeg decoder is slower on most machines (integer-only) and has some other problems. commit 0f72485ee72d23fe1ff3db39310836f776ba9f6a Merge: 8b33a04 4e50b6d Author: Uoti Urpala Date: Mon Jan 25 14:52:29 2010 +0200 Merge svn changes up to r30264 Conflicts: gui/wm/ws.c commit 8b33a04d023e858e413bf720f68b40c4297e059a Merge: 47a04d4 7712ce8 Author: Uoti Urpala Date: Mon Jan 25 14:45:22 2010 +0200 Ignore svn changes up to r30255 libswscale changes and useless stuff for internal FFmpeg build. commit 47a04d40f35a02a64f8410ee684affc5f0af894f Merge: ffc3db2 a91c199 Author: Uoti Urpala Date: Mon Jan 25 14:34:56 2010 +0200 Merge svn changes up to r30250 commit 196fea8c3bd2a62897b49cb3947b182eaf8e874a Author: stefano Date: Sun Jan 24 21:28:17 2010 +0000 Fix mis-computation of the needsDither variable erroneously introduced in r30419, which was causing a swscale-example regression. Also increase my liter count by 20.0 units. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30431 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0f4d83ce51fc4404381170f3181cd50c7ed917c1 Author: reimar Date: Sun Jan 24 21:15:43 2010 +0000 Use av_malloc to ensure sufficient alignment and also free at least some of the allocated memory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30430 b3059339-0415-0410-9bf9-f77b7e298cf2 gui/bitmap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 2e50d88ab2e5eb637abe5c4d5af244f52929ad31 Author: reimar Date: Sun Jan 24 20:54:17 2010 +0000 If audio was identified as DTS in the PMT do not override that with TrueHD based only on substream id. Works with all available DTS and TrueHD samples available (2 each). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30429 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_ts.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit fb8c6688c96a64ee464d6d3eae5716a8e6bb081f Author: reimar Date: Sun Jan 24 20:46:26 2010 +0000 Fail ad_pcm initialization of WAVEFORMATEX header is missing instead of crashing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30428 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_pcm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit b8b5fe55706afa272fde0cea8ab880390700624b Author: reimar Date: Sun Jan 24 20:05:28 2010 +0000 Add support for parsing MLP and TrueHD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30427 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 61fad6af425c7c40f39f0cc7ed725ffd8dfc058b Author: cehoyos Date: Sun Jan 24 19:50:27 2010 +0000 Revert the xvmc part of r30422: VCR2 at least worked with xvmc at some point. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30426 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 2e0a4996e3a98ecb5848c906291597589b415268 Author: stefano Date: Sun Jan 24 17:44:43 2010 +0000 Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30425 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/utils.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 632a899a22d24a1145373911551456c74f7ec4af Author: reimar Date: Sun Jan 24 17:05:53 2010 +0000 Add forgotten declaration of ds_clear_parser. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30424 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 644f2b33ec712f6bf48b082d6a20628124167229 Author: reimar Date: Sun Jan 24 16:38:46 2010 +0000 Remove now unused variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30423 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit f712f0ee960f2ee0adefe43c92ab00d06e0e569b Author: cehoyos Date: Sun Jan 24 16:06:41 2010 +0000 VCR2 fails for mpeg12, decodes incorrectly (and cannot be fixed) for VDPAU, and I doubt it works for XVMC or mpegpes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30422 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 573a57de1cd5d4f705d990677d6167eb17eca687 Author: reimar Date: Sun Jan 24 15:19:14 2010 +0000 Reset the parser on seek. Should fix some cases of audio "blips" after seeking. AC3 is still broken due to the libavcodec parser being broken. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30421 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_ffmpeg.c | 1 + libmpdemux/demuxer.c | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) commit 71dcc053fe61841201abe1034a86eae863197c48 Author: reimar Date: Sun Jan 24 15:16:39 2010 +0000 Move the resync-related code into more consistent places instead of having it scattered all over the place with half of it forgotten in some places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30420 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_audio.c | 2 + libmpcodecs/dec_video.c | 4 +++ libmpdemux/demuxer.c | 57 ++++++++++++++++++---------------------------- mencoder.c | 1 - mplayer.c | 6 ----- 5 files changed, 28 insertions(+), 42 deletions(-) commit a68252979ac93252ac9b11f83b74feb029bca9c0 Author: Kovensky Date: Sun Jan 24 11:24:54 2010 -0300 Have the freetype test use pkg-config Simplifies cross-compiling configure | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) commit fab20543e7bb43c9282e666b52ebc8db919b2fae Author: Kovensky Date: Sun Jan 24 11:24:16 2010 -0300 libass requires freetype ass_mp.c depends on a symbol that is only compiled in when freetype is enabled. configure | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 7f84400ea798d603613a893f957c0dafc5af909c Author: Kovensky Date: Sun Jan 24 11:22:49 2010 -0300 Use $_target-pkg-config if available Simplifies cross-compiling. configure | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) commit 9ca33c46d02b0454a748c3b5e685f7d566a2fb78 Author: Kovensky Date: Sun Jan 24 10:18:49 2010 -0300 Fix compilation of MEncoder mencoder.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 213092c8dcfc925d8d54cf320b60cf298a870696 Author: stefano Date: Sun Jan 24 12:55:05 2010 +0000 Use av_get_bits_per_pixel() for computing the bits per pixel of the source and destination format, cache those values in the newly added SwsContext:srcFormatBpp and SwsContext:dstFormatBpp fields, and remove the fmt_depth() function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30419 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 14 +++++++------- libswscale/swscale_internal.h | 40 ++-------------------------------------- libswscale/utils.c | 2 ++ libswscale/yuv2rgb.c | 2 +- 4 files changed, 12 insertions(+), 46 deletions(-) commit 4b2e107710a1f81368433445ee7ed366a4f49700 Author: reimar Date: Sun Jan 24 10:13:33 2010 +0000 Fix ftp support to properly support large files > 2GB. Patch by Yuriy Kaminskiy [yumkam mail ru] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30418 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_ftp.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 432704de08b3cb2d2c850070486ef7fc0aa6b88e Author: Kovensky Date: Sun Jan 24 02:31:44 2010 -0300 Compilation fix Broke after the sync with uau libvo/vo_direct3d.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit f5209d8cc4c8f29f435e924b3769c51dc91a352b Author: Gabrov Date: Sun Jan 24 03:21:18 2010 +0000 new year in version string git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30417 b3059339-0415-0410-9bf9-f77b7e298cf2 version.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0d4517c6887d2379179ddd26f669c0cb45f4f88a Author: Gabrov Date: Sun Jan 24 03:19:47 2010 +0000 typo fix, accidently reverted the new year patch with previous commit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30416 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4d300c905628d2f5ca92a31a332d644c6cab5e65 Author: Gabrov Date: Sun Jan 24 03:16:13 2010 +0000 synced with r30414 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30415 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) commit e61e9b0b8aef73f3a901ea360448b2a34a76f58e Author: Gabrov Date: Sun Jan 24 03:15:18 2010 +0000 big new year patch for documentations git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30414 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/cs/mplayer.1 | 2 +- DOCS/man/de/mplayer.1 | 2 +- DOCS/man/en/mplayer.1 | 2 +- DOCS/man/es/mplayer.1 | 2 +- DOCS/man/fr/mplayer.1 | 2 +- DOCS/man/hu/mplayer.1 | 2 +- DOCS/man/it/mplayer.1 | 2 +- DOCS/man/pl/mplayer.1 | 2 +- DOCS/man/ru/mplayer.1 | 2 +- DOCS/man/zh_CN/mplayer.1 | 2 +- DOCS/xml/cs/documentation.xml | 1 + DOCS/xml/de/documentation.xml | 1 + DOCS/xml/en/documentation.xml | 1 + DOCS/xml/es/documentation.xml | 1 + DOCS/xml/fr/documentation.xml | 1 + DOCS/xml/hu/documentation.xml | 1 + DOCS/xml/it/documentation.xml | 1 + DOCS/xml/pl/documentation.xml | 1 + DOCS/xml/ru/documentation.xml | 1 + DOCS/xml/zh_CN/documentation.xml | 1 + 20 files changed, 20 insertions(+), 10 deletions(-) commit c9c95b90461baa1827d8dc7f9ac3a8b80e139dcb Author: ramiro Date: Sun Jan 24 03:02:40 2010 +0000 Indent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30413 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 188 +++++++++++++++++++++++++------------------------- 1 files changed, 94 insertions(+), 94 deletions(-) commit 0ae7ed631b3cd13d19ae01bb7cb1165befb97410 Author: ramiro Date: Sun Jan 24 02:16:26 2010 +0000 Don't redefine M_PI. It is already defined from libavutil/mathematics.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30412 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/utils.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) commit d9f2d9d62c3db77459d9bdce11e4dc33815f97bd Author: ramiro Date: Sun Jan 24 02:08:22 2010 +0000 Split swscale.c into scaler code (swscale.c) and utility code (utils.c). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30411 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/Makefile | 2 +- libswscale/swscale.c | 1551 +--------------------------------------- libswscale/swscale_internal.h | 17 + libswscale/utils.c | 1589 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1620 insertions(+), 1539 deletions(-) commit 5d8cb1b30f04f66d6579db69abe678fb731f9cf8 Author: Kovensky Date: Sat Jan 23 21:08:33 2010 -0300 Update FFmpeg and libass build/ffmpeg | 2 +- build/ffmpeg-mt | 2 +- build/libass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 419798e2cd462cb7de5c6790fd69de9e6446e5e3 Merge: ec09523 ffc3db2 Author: Kovensky Date: Sat Jan 23 21:07:50 2010 -0300 Sync sources with uau Conflicts: Makefile configure etc/codecs.conf libvo/vo_direct3d.c mplayer.c commit 4e90199d2ee19ecaab142ee6e34327ac5dda6166 Author: reimar Date: Sat Jan 23 23:50:25 2010 +0000 Switch -vf halfpack to use only public API of libswscale. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30410 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_halfpack.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) commit cbcae4856c9693952e32d5239eb1f1e8e811473e Author: reimar Date: Sat Jan 23 19:00:09 2010 +0000 Make the scale filter prefer yuv conversions that do not need chroma scaling. Also always try keeping input and output format the same first. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30409 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 48 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 41 insertions(+), 7 deletions(-) commit 86f1430a590e1f017556a94281a9f81aef4413cf Author: reimar Date: Sat Jan 23 18:37:47 2010 +0000 Remove the query_format_cache, it is extra complexity that makes improvements difficult while the speed advantage in normal use cases is not measurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30408 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) commit f1714582b280a6e5fe7e4a6134e2e253421868a3 Author: reimar Date: Sat Jan 23 18:28:47 2010 +0000 Simplify loop condition git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30407 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a30dbabd9f29870103d19718ec033fe194cfb635 Author: compn Date: Sat Jan 23 15:41:58 2010 +0000 clean up netstream docs in TOOLS/README git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30406 b3059339-0415-0410-9bf9-f77b7e298cf2 TOOLS/README | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) commit 7725c6d73b3bf2f20ee7c5aac18c76eb8397c7ef Author: reimar Date: Sat Jan 23 14:57:43 2010 +0000 Make sure that a qstride of 0 (intentional or not) does not completely break the code (crash if malloc(0) != NULL, otherwise wrong qscales used for B-frames). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30405 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_fspp.c | 12 +++++++++--- libmpcodecs/vf_spp.c | 10 ++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) commit 570f1f5dec2f92f46a9628df2ff9b0f5620532a8 Author: reimar Date: Sat Jan 23 12:27:13 2010 +0000 Always call cache_uninit to immediately free everything cache-related if we fail to enable the cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30404 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) commit 73dea88956982bde9257946545babc9dedc52bda Author: reimar Date: Sat Jan 23 12:21:07 2010 +0000 Call cache-uninit unconditionally, it should always be safe to call. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30403 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 4e28b4bc9ed8e29daf3570596cc7a4c5325e8039 Author: reimar Date: Sat Jan 23 12:13:28 2010 +0000 Change code to allow playing a stream even if enabling the cache failed while still handling it when the user aborts the cache fill. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 6 ++++-- stream/cache2.c | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) commit 0e86058912f8ad3af2d49e0eedf01b585bd5732c Author: reimar Date: Sat Jan 23 11:51:13 2010 +0000 Make cache_init static, it is not used outside this file git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30401 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a92b3d446be8d5f99dba5bf32280661192283174 Author: reimar Date: Sat Jan 23 11:21:56 2010 +0000 Support more formats for -ao pcm in raw mode. Patch by Peter Fordham [peter.fordham gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30400 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_pcm.c | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) commit 03af209bf71722c7a7e8172ab7012096a11b744a Author: reimar Date: Sat Jan 23 11:14:18 2010 +0000 Handle Content-Length also when Content-Type is not set. Based on patch by Yuriy Kaminskiy [yumkam mail ru] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30399 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/http.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) commit e177aedfc1113c07720e61a9c102e26425803bfd Author: reimar Date: Sat Jan 23 11:08:45 2010 +0000 Use atoll to parse Content-Length to support http for files > 2GB. Patch by Yuriy Kaminskiy [yumkam mail ru]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30398 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 567a8d69a48869e80420b5aaa6e7815dec7c0439 Author: reimar Date: Sat Jan 23 11:03:10 2010 +0000 Add an exit() to silence a gcc warning and ensure forked code will never leave the cache-loop function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30397 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit a2d8222f3d6962d1b1f0f477c5b53b4be6123788 Author: reimar Date: Sat Jan 23 11:00:13 2010 +0000 100l, shouldn't write to memory after freeing it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30396 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 9869be806ba8dee16eb5f7c8d96655380fd322d0 Author: reimar Date: Sat Jan 23 10:54:03 2010 +0000 Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30395 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 3fae575483e9f33df184596a2c8c59cd5bdb3610 Author: reimar Date: Sat Jan 23 10:53:28 2010 +0000 Zero freed pointers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30394 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 7afaecc11191c641dcbd231cae18c1aa07000dd0 Author: reimar Date: Sat Jan 23 10:50:50 2010 +0000 Check for fork failing and make sure cache_uninit always frees the cache data even if fork failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30393 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) commit a281ccb094b81b5a7a92956ac98e7b7e8d96236b Author: jrash Date: Fri Jan 22 23:53:15 2010 +0000 sync with en/mplayer.1 r30336 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30392 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) commit c2ffe44a28afb9aea4477535197c52e19f3746a5 Author: reimar Date: Fri Jan 22 23:19:59 2010 +0000 Remove any auto-inserted lavc filter. Makes sure it will not be around if we e.g. try again with a different codec, which can lead to -vo null being excessively slow. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30391 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) commit 3526daed7ac957586b5a855ec56b4736191e7907 Author: reimar Date: Fri Jan 22 22:10:28 2010 +0000 Fix sub_free to actually free the subtitle data. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30390 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit 7b953c1763bc3c1d4f8c051efe160989235385ef Author: reimar Date: Fri Jan 22 21:49:05 2010 +0000 Fix a memory leak in the subreader. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30389 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 1e4f16a344ef975eec159a01ae5e902e5f75bcc1 Author: reimar Date: Fri Jan 22 21:16:54 2010 +0000 Replace strncat by av_strlcat which is easier to verify for correctness. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30388 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 66998a98daef91678a51c3477fd06c59e1d7105a Author: reimar Date: Fri Jan 22 21:10:40 2010 +0000 Also handle ASS subtitles when removing subtitles via sub_remove slave command. Fixes memory leaks and other strange behaviour like mismatch of name and subtitle data. Based on patch by Yuriy Kaminskiy [yumkam mail ru]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30387 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) commit 3876d60f625baffa9208e1c49c33c5e93fa02c48 Author: reimar Date: Fri Jan 22 20:59:15 2010 +0000 Avoid duplicating code to remove subtitles (sub_remove slave command). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30386 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 79 +++++++++++++++++++++++++++++++----------------------------- 1 files changed, 41 insertions(+), 38 deletions(-) commit 134976ee4d0f58fca20aa2b79d874d035b0bc30b Author: mru Date: Fri Jan 22 03:26:30 2010 +0000 Move array specifiers outside DECLARE_ALIGNED() invocations git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30385 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/ppc/swscale_altivec_template.c | 8 ++++---- libswscale/ppc/yuv2rgb_altivec.c | 4 ++-- libswscale/swscale.c | 22 +++++++++++----------- libswscale/swscale_internal.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) commit 937c4fab19b5eec3ff2f6cfa4eeae3b809e63f19 Author: diego Date: Thu Jan 21 11:16:03 2010 +0000 Disable all hwaccel glue code from FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30384 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) commit 34db438211aa5f734cc526fe3c55afb69e80d0cb Author: cehoyos Date: Thu Jan 21 10:37:35 2010 +0000 x264 version 0.83 is required. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30383 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4e92beb4eaa44157a2635c22216c7c01f85d431b Author: cehoyos Date: Thu Jan 21 10:31:34 2010 +0000 Fix compilation after FFmpeg r21353. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30382 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 450cef62b0dc15f70fa2949b5db547b668397924 Author: conrad Date: Thu Jan 21 09:52:11 2010 +0000 More const-correctness for sws_scale git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30381 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 4 ++-- libswscale/swscale.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) commit ffc3db22395b2a505e2f9ef6e805650c9b375731 Author: Uoti Urpala Date: Thu Jan 21 00:58:06 2010 +0200 vd_ffmpeg: fix compilation with neither VDPAU nor XvMC enabled The get_format() function was defined under #if CONFIG_XVMC || CONFIG_VDPAU but recent commit ca217f4557c3cff4f2bf33e605ce13e662e84a92 added an unconditional reference to it, causing linking to fail with an undefined reference if neither feature was enabled. Fix by removing the #if, there's no reason reason why it would be needed. libmpcodecs/vd_ffmpeg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 1ef8d887d425c42de004e5fda7d2f9376097aa8a Author: Uoti Urpala Date: Wed Jan 20 20:31:05 2010 +0200 vd_ffmpeg: FFmpeg-mt changed has_b_frames API, update libmpcodecs/vd_ffmpeg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit d4159a7d883bd90028db1d76f384bf2574416858 Author: Uoti Urpala Date: Wed Jan 20 17:21:39 2010 +0200 vd_ffmpeg: move redundant info messages to MSGL_V level Move two messages printed when using VDPAU/XvMC to MSGL_V level: "[VD_FFMPEG] XVMC-accelerated MPEG-2.\n" "[VD_FFMPEG] Trying pixfmt=%d.\n" The first is redundant because this info is normally visible from the decoder name, and it was also incorrectly printed in the VDPAU case too. Add a different MSGL_V message for VDPAU. Also make all these messages not translatable. libmpcodecs/vd_ffmpeg.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit ca217f4557c3cff4f2bf33e605ce13e662e84a92 Author: Uoti Urpala Date: Wed Jan 20 16:31:13 2010 +0200 vd_ffmpeg: disable callbacks for threaded decoding MPlayer's slice and direct rendering related callbacks are not safe to call from other threads, so disable those features if more than one decoding thread is specified. This should fix some issues when using threaded decoding with formats other than h264 (in the h264 case the callbacks were already disabled for other reasons). This commit moves most of the code that sets special avctx parameters for VDPAU and XvMC. Before that was done after avcodec_open() based on the selected output image format; now it's done before avcodec_open() based on the capabilities of the selected decoder. At least the code selecting the thread count must be before avcodec_open(), and I think there is no reason to try to keep the previous structure otherwise either. The image format-based approach was implemented by Reimar with the intended goal of eventually selecting between software and VDPAU decoders under one FFmpeg decoder type. I consider that goal to be questionable, and the approach certainly made the existing code significantly messier for no functionality benefit. libmpcodecs/vd_ffmpeg.c | 58 ++++++++++++++++------------------------------ 1 files changed, 20 insertions(+), 38 deletions(-) commit 06c49d538d788c0d441744683bfe2e113a854f2c Author: ramiro Date: Wed Jan 20 03:26:12 2010 +0000 Document some more of SwsContext. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30380 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 80 +++++++++++++++++++++++++++------------- 1 files changed, 54 insertions(+), 26 deletions(-) commit 39bcd6edcf82f15f11b123ee2179c41f7b4d6b9f Author: stefano Date: Wed Jan 20 00:22:31 2010 +0000 Avoid more pointless tests, the input and output formats need to be supported both as input and as output, as the conversion performed is: yuva420p -> src -> dst -> yuva420p. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30379 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale-example.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e8da74db1ffca11afcff15e5d7c55c09257332d5 Author: stefano Date: Tue Jan 19 22:36:46 2010 +0000 Split overly long line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30378 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 85d89af72ebae6adf054918f4e9b42cbde81fa1e Author: stefano Date: Tue Jan 19 21:52:00 2010 +0000 Make selfTest() perform tests where both the input and output formats are supported, avoid pointless loops. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30377 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale-example.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 2c6df2c12019d363990b9eb2aec0e8954d8587ed Author: diego Date: Tue Jan 19 18:53:16 2010 +0000 Create libavutil/avconfig.h, required for FFmpeg compilation. based on a patch by Etienne Buira, etienne.buira free fr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30376 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit c2ba58aefce038ce4ccf6ed23791f5de823aa041 Author: ptt Date: Tue Jan 19 18:02:44 2010 +0000 synced with r30336 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30375 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) commit de1ca7fb29a302de8802d2706c7c6bd9f7169b1a Author: benoit Date: Tue Jan 19 16:30:20 2010 +0000 Make const prototypes for input sources of sws_scale_* stricter. Patch by Alexis Ballier gmailify($firstname, $familyname) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30374 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 4 ++-- libswscale/swscale.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 4277621a410c701dca7f3ba837f7a108139ba144 Author: ramiro Date: Tue Jan 19 15:42:51 2010 +0000 swscale-example: Add comment about the use of av_{malloc,free}. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30373 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale-example.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 37fd4d44bda2519e718d7fa3cef62a644539529d Author: zuxy Date: Tue Jan 19 13:35:57 2010 +0000 Set HAVE_FAST_CLZ according to CPU type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30372 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) commit d4e79342c107a0a4e3f3c2069e1162276c9b6bcd Author: ramiro Date: Tue Jan 19 11:35:04 2010 +0000 Remove useless forward declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30371 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 4455af672061aa8ffa7ee303ba264a0c72c3b4eb Author: zuxy Date: Tue Jan 19 05:21:17 2010 +0000 User friendly warning message that gives out names of source and target formats git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30370 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 51f1113b157dc394016b73e51ba1e0c8656ee36b Author: mru Date: Tue Jan 19 03:47:11 2010 +0000 swscale-example: use av_malloc() Image buffers require 16-byte alignment, so av_malloc() should be used. Fixes crash on PPC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30369 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale-example.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) commit d448df5addccc65cb0bbbd8d1a48f99aa7067b97 Author: stefano Date: Mon Jan 18 23:34:07 2010 +0000 Split long line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30368 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale-example.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 18f9a9bebccfdf28ff4cab1e74cc910e26f3aac4 Author: stefano Date: Mon Jan 18 23:33:17 2010 +0000 Convert int -> enum PixelFormat in doTest(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30367 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale-example.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a0f08fbebbdf211ce2a69f1c3ab891a5a1ca9b8c Author: Uoti Urpala Date: Mon Jan 18 14:38:56 2010 +0200 stream: improve EOF handling in seeks Reset stream 'eof' flag when a seek succeeds, and allow seeking to a position at or past EOF (in the sense that the seek succeeds and stream_tell() then returns that position). This fixes at least some demuxer problems where an attempt to read the index from the end of an incomplete file would set the 'eof' flag and cause subsequent reads to fail, even if failure to read the index would otherwise be nonfatal and demuxing could continue after seeking back. Partially based on a patch from Laurent . stream/stream.c | 16 ++++++++++------ stream/stream.h | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) commit 2ab8c5d481236951b8060827df31b64ef639feda Author: ptt Date: Mon Jan 18 10:44:30 2010 +0000 synced with r30197 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30366 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 101 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 70 insertions(+), 31 deletions(-) commit 2257b14a19fbdde84379e9fc51fe85049c3f5a5e Author: zuxy Date: Mon Jan 18 08:42:04 2010 +0000 Define out currently unused static functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30365 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/yuv2rgb.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 9b08d26bfb471bef5076a54ca89d47c39ffc2a15 Author: compn Date: Mon Jan 18 03:55:16 2010 +0000 add uldx and vspx fourcc to ffodivx in codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30364 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 3b949d7bdf5dd8806883be37345ead55fff1a030 Author: zuxy Date: Mon Jan 18 03:06:43 2010 +0000 Support for detection of AMD Phenom. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30363 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 91e4519ed0058209c9bf9b0d0e28cf08e8bdf628 Author: stefano Date: Sun Jan 17 23:29:31 2010 +0000 Remove stray '\' at the end of macro definitions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30362 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) commit c60f68724c96137e06afded2e3f5be028f7ac180 Author: stefano Date: Sun Jan 17 23:17:47 2010 +0000 Remove duplicated or pointless newlines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30361 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) commit aadf8843d79c8e6eb41f66c49967e9c86a5e3ab6 Author: stefano Date: Sun Jan 17 23:07:37 2010 +0000 Factorize error message logging, log it if the converter cannot be set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30360 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) commit 6db184bb8026dbc8c9772aa7e853301fbc67119b Author: stefano Date: Sun Jan 17 23:02:20 2010 +0000 Reindent after the last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30359 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) commit 3c54865aeab03d40ed311818a1dcf212171dd176 Author: stefano Date: Sun Jan 17 23:00:01 2010 +0000 Make the pal2rgbWrapper set and use the converter in pal2rgbWrapper only if the input format is paletted. Fix potential crashes/weirdness if the input format is non-paletted. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30358 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit 1a8479b95e38e0db089c3eadee419c61562ad19c Author: mru Date: Sun Jan 17 19:26:35 2010 +0000 Remove double const git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30357 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit acd1a4075d77c5d145fc2ee6453340c3f2352c12 Author: stefano Date: Sun Jan 17 15:11:25 2010 +0000 Factorize error message logging in rgb2rgbWrapper(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30356 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) commit 1a5841fbbb632323057d79e329d0736e349704eb Author: reimar Date: Sun Jan 17 15:08:31 2010 +0000 Add a proper header for our strsep implementation so strsep will not be used without a declaration, causing issues on 64 bit systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30355 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af.c | 1 + libmpcodecs/ve_lavc.c | 1 + libmpdemux/mf.c | 1 + osdep/strsep.c | 1 + osdep/strsep.h | 30 ++++++++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 0 deletions(-) commit ed03545c3c0c5be509365e695f32e83a446c6cf8 Author: reimar Date: Sun Jan 17 14:58:44 2010 +0000 Reuse the fmt-conversion code instead of duplicating the functionality. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30354 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ve_lavc.c | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) commit 89d8ae77a82461e82e7a78eb0e97a1b727675edc Author: reimar Date: Sun Jan 17 14:54:38 2010 +0000 Add big- and little-endian variants of the 15 and 16 bit RGB/BGR formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30353 b3059339-0415-0410-9bf9-f77b7e298cf2 fmt-conversion.c | 12 ++++++++---- libmpcodecs/img_format.h | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) commit aedf40e334b1ae42ff588ddafff6c09f0f165526 Author: reimar Date: Sun Jan 17 14:53:12 2010 +0000 Do not depend on PIX_FMT_RGB32 which is (currently?) not part of the public API. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30352 b3059339-0415-0410-9bf9-f77b7e298cf2 gui/bitmap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 2f7f6fdb9d21648cb14ac0125d61c6215a11b263 Author: reimar Date: Sun Jan 17 14:40:44 2010 +0000 More format support in fmt-conversion.c: split RGB32 and BGR32 into ARGB, BGRA, ABGR, RGBA. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30351 b3059339-0415-0410-9bf9-f77b7e298cf2 fmt-conversion.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 1d08d54a97e806db664bf04da3cf6675ddf3bbb8 Author: mru Date: Sun Jan 17 14:25:19 2010 +0000 Reindent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30350 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 9c1aafc17c8ba6441ca86fb46d5d9f584b179436 Author: mru Date: Sun Jan 17 14:25:17 2010 +0000 Remove inline from initFilter() It makes no sense having that function inlined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30349 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8afef4e19ca476e4f7e5b56e65e7ab59409d285d Author: reimar Date: Sun Jan 17 13:28:29 2010 +0000 Hack to avoid a GUID_NULL clash on 64 bit MinGW. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30348 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/dshow/guids.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 77af8d08592dbcb80ed87336b630507639a16d38 Author: reimar Date: Sun Jan 17 13:18:59 2010 +0000 Add hack to fix tvi_dshow compilation with 64-bit MinGW git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30347 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/tvi_dshow.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 33809543d8dded7045234066627443dc9f894be5 Author: reimar Date: Sun Jan 17 12:32:25 2010 +0000 Mention systems that have received major build fixes recently in the Changelog. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30346 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 535803c310e66ecb16223f7a853e15f566c49ae4 Author: reimar Date: Sun Jan 17 12:27:54 2010 +0000 Set ASFLAGS and HAVE_VFP_ARGS needed to compile for ARM with VFP/NEON support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30345 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 28aa29222e6223002931506a365b007d66ed979b Author: reimar Date: Sun Jan 17 11:49:33 2010 +0000 Also try linking against dxguid for SDL test. Some broken SDL versions need it even though sdl-config does include it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30344 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8277134a67b0a374c6c9398d852ed681f9146145 Author: reimar Date: Sun Jan 17 11:43:55 2010 +0000 Change GUID declarations in vo_directx to be static. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30343 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_directx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit abf7e21e7960b9040b70be98b99f9c52bf952d7b Author: reimar Date: Sun Jan 17 11:41:54 2010 +0000 Change GUID declarations in tvi_dshow so they are not exported and thus will not cause clashes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30342 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/tvi_dshow.c | 114 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 76 insertions(+), 38 deletions(-) commit f9569e1114eff7a4bfe242ede9a6f89de806fa77 Author: stefano Date: Sun Jan 17 00:26:29 2010 +0000 Add a const qualifier in a cast, fix the gcc warning: swscale.c: In function ‘sws_scale’: swscale.c:2968: warning: cast discards qualifiers from pointer target type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30341 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 21a572c8de0341392b25da848164928e9575079b Author: stefano Date: Sun Jan 17 00:21:50 2010 +0000 Add a const qualifier in a cast, fix the gcc warning: swscale.c: In function ‘planarCopy’: swscale.c:2256: warning: cast discards qualifiers from pointer target type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30340 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 452993b4eb85f4b13b8365e931aecbfc1bea876e Author: reimar Date: Sat Jan 16 23:22:43 2010 +0000 Allow anything starting with "arm" to be used as --target for ARM CPUs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30339 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit d11d2ab24257f8e0b1574d9cd23245fcef4d1272 Author: stefano Date: Sat Jan 16 22:49:00 2010 +0000 Fix typo, "get rid off" -> "get rid of". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30338 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 35c0d80e2fd00fa1d98097d5b8c328c5184e9860 Author: reimar Date: Sat Jan 16 20:04:34 2010 +0000 Mention levelconv -vo gl suboption in Changelog. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30337 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d56815320465a6745eaa3d07bed5a01bd2a0fb30 Author: reimar Date: Sat Jan 16 20:03:35 2010 +0000 Document levelconv -vo gl suboption. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30336 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit cbd5caef0e8862dcafd40d80d28f4bca73882f97 Author: reimar Date: Sat Jan 16 19:59:31 2010 +0000 Add support for adjustable TV <-> PC level conversion. This could also be done by modifying contrast and brightness, but this seems a bit more flexible and easier to use. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30335 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/csputils.c | 11 +++++++++-- libvo/csputils.h | 8 ++++++++ libvo/vo_gl.c | 15 ++++++++++++++- libvo/vo_gl2.c | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) commit 68544d15da70e99724f6e7df43ab2d74d4750b66 Author: stefano Date: Sat Jan 16 19:51:26 2010 +0000 Revert r30331, which broke compilation. swScale_C is not templated if any optimization is to be used and !runtime_cpudetect. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30334 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) commit e1a3ac7fb2af13f4cbe125ac4d4869160704d4bf Author: stefano Date: Sat Jan 16 19:32:58 2010 +0000 Prefer enum PixelFormat to int as the parameter type of fmt_depth(fmt). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30333 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ae2e7d7298f205182043d5aaccc02f8583dd6230 Author: stefano Date: Sat Jan 16 19:22:30 2010 +0000 Declare with av_unused the variable alpMmxFilter, fix the gcc warning: swscale_template.c: In function ‘swScale_C’: swscale_template.c:2580: warning: unused variable ‘alpMmxFilter’ swscale_template.c: In function ‘sws_init_swScale_C’: git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30332 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5cd08a9945dbd9f38fdec73266db320a8b0ba587 Author: stefano Date: Sat Jan 16 19:19:54 2010 +0000 Factorize the code which calls the non optimized C functions in getSwsFunc(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30331 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) commit 5ffab28a7cb64532b75f4aa93291d96bb0270c0a Author: stefano Date: Sat Jan 16 19:14:29 2010 +0000 Prefer "to %s%s" over "to%s %s", slightly more readable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30330 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit d77dc477c51ebc5a59b417fab14e58b00f3e0de3 Author: stefano Date: Sat Jan 16 19:11:03 2010 +0000 Simplify code in sws_getContext() which logs if the destination format support dithering, remove the const char *dither variable and use a literal string instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30329 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) commit 3c8de6d0064f53af517618654bc73660058dbe48 Author: ramiro Date: Sat Jan 16 19:04:55 2010 +0000 Document some of SwsContext. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30328 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) commit 14fe9544f9949cfe41f1dfd92671c32c9de650ea Author: ramiro Date: Sat Jan 16 18:39:06 2010 +0000 Reuse h{lum,chr}Filter{,Pos} variables for MMX2 fast_bilinear horizontal scaler. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30327 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 16 ++++++---------- libswscale/swscale_internal.h | 4 ---- libswscale/swscale_template.c | 12 ++++++------ 3 files changed, 12 insertions(+), 20 deletions(-) commit 1f126fc60cdfb7eef4d42c1593aaaddda4935a37 Author: Uoti Urpala Date: Sat Jan 16 20:37:13 2010 +0200 Avoid misleading error "ASS: cannot add video filter" When using libass with a VO that has direct EOSD support the vf_ass video filter is unnecessary and is not added automatically, but the code that adds the filter when it is needed produced misleading output messages in this case. The following two messages were printed at MSGL_ERR level, making it look like an error condition: Couldn't open video filter 'ass'. ASS: cannot add video filter Add a version of vf_open_plugin() called vf_open_plugin_noerr() that does not itself print an error message if opening a vf fails and that returns the exact status code returned by the vf open() function. Make vf_ass return a different status code depending on whether there was an actual error or if it determined a filter would be redundant. Use the _noerr function in the code adding the filter to avoid the first message and check the status code to avoid the second. libmpcodecs/vf.c | 24 +++++++++++++++++++++--- libmpcodecs/vf.h | 4 ++++ libmpcodecs/vf_ass.c | 6 ++++-- mplayer.c | 8 +++++++- 4 files changed, 36 insertions(+), 6 deletions(-) commit 5d8bd54019d182aafcaa69d6cd519af31bacbc20 Author: stefano Date: Sat Jan 16 18:36:21 2010 +0000 Factorize code which logs the source and destination formats in sws_getContext(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30326 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) commit 43c3a07f5812bfe32b1d65cced7f4d07213e1c72 Author: Uoti Urpala Date: Sat Jan 16 17:38:58 2010 +0200 subtitles: avoid running subreader.c parser when using libass When loading external subtitle files, the code always tried parsing the file with subreader.c sub_read_file() first, even if libass was then used to parse and render the file (the results of the first parsing would be ignored in that case). This could cause problems like unnecessary error messages. Change the code to try libass parsing first if enabled, and skip subreader.c parsing if that succeeds. mplayer.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) commit f65ce5d163ea45a4c4734e060968b3b4f5f1f66a Author: reimar Date: Sat Jan 16 16:39:46 2010 +0000 Manually add --nxcompat --no-seh --dynamicbase to linker flags if available, works around binutils' policy of making exploits as easy as possible by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30325 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit cd2dbe5939814168ff91ae728080c432cc8b3fde Author: reimar Date: Sat Jan 16 16:22:57 2010 +0000 Fix struct addrinfo check, its definition might not allow actually allocating it. Fixes MinGW64 compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30324 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a12d96e87e113044ea57cd85ee27e15a1749fc49 Author: reimar Date: Sat Jan 16 16:16:50 2010 +0000 Fix sockaddr_storage check to work with winsock/MinGW git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30323 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) commit 5f5462c0ec32348a0b370b1f9c11bd7d10b52de6 Author: reimar Date: Sat Jan 16 15:21:36 2010 +0000 Add HAVE_FAST_CLZ define and set it to 0 to keep the status quo for now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30322 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit b18ddf98075560b87f7914db7187fd97934625ab Author: reimar Date: Sat Jan 16 15:20:26 2010 +0000 HAVE_INLINE_ASM for FFmpeg should be one since we only support compilers that can do inline asm. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30321 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ee2a738ff88d4b9c203b3433e0ca4bfb661ec75d Author: reimar Date: Sat Jan 16 15:04:17 2010 +0000 Document some of the ext_stub magic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30320 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/win32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit e09b799ade1f19edf88c1c3271efe89c05a8af02 Author: reimar Date: Sat Jan 16 15:02:49 2010 +0000 100l, forgot to change the "magic" value in the stub also in the place replacing it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30319 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/win32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8568e701eae19f7a6dfc50bdb1159972dd474b51 Author: compn Date: Sat Jan 16 13:59:59 2010 +0000 add AV1x, AVup and VDTZ fourcc to ffrawuyvy and VDTZ to rawuyvy change ffsipr to working (and first choice by default) in codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30318 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 4644bd629319194c7673faea08058514bd24c7cb Author: stefano Date: Sat Jan 16 11:08:16 2010 +0000 Simplify reset_ptr(): employ usePal() macro rather than enumerating all the paletted formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30317 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) commit f7c5fa6a1450a36dde0ec99d82d70adb92574599 Author: Gabrov Date: Sat Jan 16 10:48:23 2010 +0000 synced with r30311 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30316 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 57 ++++++++++++++++++++++++++++++++++++++++-------- help/help_mp-hu.h | 3 +- 2 files changed, 49 insertions(+), 11 deletions(-) commit 6ead3e936b8344d13c56567142d95cff0d4d8c90 Author: Uoti Urpala Date: Sat Jan 16 12:30:34 2010 +0200 subreader.c: fix excessive memory use with some external subtitles For each sequence of consecutive partially overlapping subtitles, the algorithm calculating screen positions for the subtitles allocated a 2*subtitle_count*subtitle_line_count array. With some karaoke subtitles that had lots of rapidly changing overlapping subtitles this became large enough to use gigabytes of memory. Make the behavior saner by limiting the line count to SUB_MAX_TEXT lines (the maximum number of lines to show on screen at once, currently 12). This shouldn't change the end result of the algorithm other than possibly printing different warnings. subreader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 93710d64bb77906ab93b065ba21325a6de4ade92 Author: mru Date: Sat Jan 16 04:48:55 2010 +0000 Add symbol versioning for shared libraries Based on patch by Reinhard Tartler git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30315 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/libswscale.v | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 3abd3dcf5771c7383c766192a0bdfa8dc9154e45 Author: reimar Date: Fri Jan 15 21:01:31 2010 +0000 We only need to disable seeking back in ad_ffmpeg when we actually _use_ a parser, not when just needs_parsing is set. Fixes playback of e.g. ADPCM in AVI like http://samples.mplayerhq.hu/avi/imaadpcm.avi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30314 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_ffmpeg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 87e34c3f3f4a88746456e9c93e6901d16195cc90 Author: ramiro Date: Fri Jan 15 19:50:59 2010 +0000 Don't initialize normal horizontal filter if MMX2 filter is used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30313 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) commit 1c6c7706eceb6b814124fc6dadea075483f0a9f9 Author: reimar Date: Fri Jan 15 19:01:03 2010 +0000 -demuxer rawaudio data will often need parsing (e.g. when it is used for raw AC3 instead of libavformat), so set needs_parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30312 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_rawaudio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit ec61df5d7914dd3bf43a6181628c5d7637eb04b4 Author: ptt Date: Fri Jan 15 15:04:30 2010 +0000 added a missing full stop git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30311 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7231e76268c37c5c5fe33cee4668f99e4f5669d5 Author: zuxy Date: Fri Jan 15 09:47:45 2010 +0000 Set _optimizing for x86-64. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30310 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0fd68f17cadab2e0f9e390ffc09b15a8982f3e37 Author: zuxy Date: Fri Jan 15 09:33:38 2010 +0000 The undocumented x86-64 is a better fallback for core2 than nocona. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30309 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 02531411b36cb152169a6113ed06cdb292418f7c Author: zuxy Date: Fri Jan 15 09:31:15 2010 +0000 Add -fno-common to avoid misalignment for global var under win32 like what has been done for ffmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30308 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 956f0444aeef85ff3b4b975fefe5c0ab9758e1f4 Author: zuxy Date: Fri Jan 15 09:10:23 2010 +0000 Set HAVE_FAST_CMOV to 0 for NetBurst based x86-64 processors, e.g. Prescott. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30307 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 0bd2e793c1f9a56250866f8bac9f502542541b68 Author: zuxy Date: Fri Jan 15 08:51:51 2010 +0000 Const correctness for src pointer. Remove all constness related warnings in libswscale. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30306 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/rgb2rgb.c | 2 +- libswscale/rgb2rgb.h | 2 +- libswscale/rgb2rgb_template.c | 2 +- libswscale/swscale.c | 52 ++++++++++++++++++------------------ libswscale/swscale.h | 4 +- libswscale/swscale_internal.h | 2 +- libswscale/swscale_template.c | 36 +++++++++++++------------- libswscale/x86/yuv2rgb_template.c | 26 +++++++++--------- libswscale/yuv2rgb.c | 12 ++++---- 9 files changed, 69 insertions(+), 69 deletions(-) commit 9cbb5c686fc5efb3767615c853f7def568a478e6 Author: zuxy Date: Fri Jan 15 07:55:07 2010 +0000 Fix typo in r30302 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30305 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 32c03dd8c27dd5f0069d8228ce352c015cdadb13 Author: stefano Date: Fri Jan 15 00:39:25 2010 +0000 Fix typo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30304 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8af165c26f73306ccc4480106fb28484851bd409 Author: ramiro Date: Thu Jan 14 19:12:42 2010 +0000 Remove unused clip_table code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30303 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) commit 3e2af067eca38c629aacf3d4f1b26d16c8a63fe9 Author: cehoyos Date: Thu Jan 14 12:06:38 2010 +0000 Fix compilation after recent changes in FFmpeg. Patch by Etienne Buira, etienne D buira A free D fr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30302 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) commit 1cda8b002fb19c3da14760fe1f9fc76992a05c29 Author: ramiro Date: Thu Jan 14 06:19:45 2010 +0000 Add const qualifier to rgb48 to YV12 functions' src. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30301 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit dadbe620d67706512e248e6cc4f99e7901acc2e1 Author: ramiro Date: Thu Jan 14 06:19:10 2010 +0000 Add missing parameter to rgb48 to YV12 functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30300 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit e38bcd7d056f9a95946ae437e6813e28196148be Author: reimar Date: Wed Jan 13 17:49:48 2010 +0000 Use double-precision constants instead of single precision that gets cast to double. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30299 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_ts.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 2b3a5105ff2f9d0b3bc8ca45f6d65d16750f400c Author: cehoyos Date: Tue Jan 12 23:03:03 2010 +0000 Use double instead of float for pts. Patch by Dan Oscarsson, Dan D Oscarsson A tieto D com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30298 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_ts.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit 0dd5d0937a5f41711501d36c08afac2adc96e040 Author: reimar Date: Tue Jan 12 22:21:21 2010 +0000 Avoid linking in assembler-optimized code that will never be used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30297 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpeg2/motion_comp_mmx.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 59fa6f549aebd49056e37c1bf26d429b71ef84ad Author: reimar Date: Tue Jan 12 21:16:01 2010 +0000 Add very experimetal support for the Sun C compiler. To actually work, all "packed" attributes have to be replaced by equivalent pragmas and make DEPS=no must be used to compile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30296 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) commit 977a21bea552d622c38db7ccf0bf20264a127e8d Author: reimar Date: Tue Jan 12 21:12:23 2010 +0000 Change -pipe check to avoid misdetecting it as available for Sun's compiler. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30295 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 06c2afa7500850bcf5274f05c7bf05fc4186e8b0 Author: reimar Date: Tue Jan 12 20:26:15 2010 +0000 Use ARCH_X86_32 instead of the compiler-specific __i386__ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30294 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/wine/winnt.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit 0d17260656af67ac07d02c8cf464f788609c9fcb Author: reimar Date: Tue Jan 12 20:20:49 2010 +0000 Remove hackish and not actually working code to make vidix compile with compilers without inline assembly. Almost no OS provides inb() etc. in its libraries, and removing the broken fallback code makes it compile on Solaris with Sun C compiler. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30293 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/AsmMacros.h | 34 ---------------------------------- 1 files changed, 0 insertions(+), 34 deletions(-) commit c69a27ef8eccb79c4c85ba966de59ee00d47e844 Author: reimar Date: Tue Jan 12 19:51:29 2010 +0000 Remove a check that simply can not have worked since it relied on a completely uninitialized variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30292 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_directfb2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit 04fde0d9368c7223ccedec6faf2016385d74fca2 Author: reimar Date: Tue Jan 12 19:41:44 2010 +0000 Add checks for exp2, exp2 and log2f required by FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30291 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit df73622d23b6233e3c1cf776c52850561a6bcdc8 Author: reimar Date: Tue Jan 12 19:03:49 2010 +0000 100l, fix typo that caused ad_hwac3 to fail to compile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30290 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_hwac3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f3f11efc7a42a9c9d284118eb8777e0aa677d25b Author: conrad Date: Tue Jan 12 19:03:09 2010 +0000 /nop is illegal with Apple's older version of gas, this was fixed elsewhere but not here since it was unused before now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30289 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/x86/yuv2rgb_template.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 071490a7a50afa319e6bc518018285c5177ce197 Author: reimar Date: Tue Jan 12 18:37:23 2010 +0000 Attempt a simple hack to fix -ac hwdts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30288 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_hwac3.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit c5bd47f54380b55a9fefe1e922a64a3a96b773ac Author: Uoti Urpala Date: Tue Jan 12 12:17:41 2010 +0200 translations: corrently translate most OSD output Add various fixes needed to actually produce translated OSD output. About every OSD string that had a translation macro under the old system should be translatable now. command.c | 101 ++++++++++++++++++++++++++++++---------------------------- m_property.c | 3 +- 2 files changed, 54 insertions(+), 50 deletions(-) commit ee98209ab84a338525e0dde9f62633bcf0b08078 Author: Uoti Urpala Date: Tue Jan 12 12:16:00 2010 +0200 translations: add infrastructure for translated OSD messages Add function set_osd_tmsg() which is a version of set_osd_msg that translates its format argument. Pass OSD message strings in the command.c property_osd_display table through mp_gtext before they're used. command.c | 8 ++++---- mp_osd.h | 1 + mplayer.c | 27 +++++++++++++++++++++------ 3 files changed, 26 insertions(+), 10 deletions(-) commit 52b2e49c2901ff4ca034aa3e64dabf799e29be7f Author: zuxy Date: Tue Jan 12 02:34:33 2010 +0000 Make sure that sfence is used after any non temporal stores. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30287 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/x86/yuv2rgb_template.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 11cd52cad4490cc57d9e3fc027f982f1c90cef81 Author: reimar Date: Mon Jan 11 21:06:00 2010 +0000 More changes needed to make ad_hwac3 truly independent from liba52. Patch by Benoît Amiaux [benoit amiaux gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30286 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad.c | 2 +- libmpcodecs/ad_hwac3.c | 6 ------ 2 files changed, 1 insertions(+), 7 deletions(-) commit b27ec53011b4c3ae0dabded53e435c3c4a3fe57a Author: reimar Date: Mon Jan 11 20:40:51 2010 +0000 Let the format filter do the AC3 endianness conversion instead of duplicating the conversion code over and over. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30285 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_lavcac3enc.c | 28 +++++++--------------------- libmpcodecs/ad_hwac3.c | 23 +++++++---------------- 2 files changed, 14 insertions(+), 37 deletions(-) commit e8dded6d4fdec359fd8753c1893db2900d79dcb2 Author: reimar Date: Mon Jan 11 20:29:33 2010 +0000 MPlayer's format now correctly identifies AC3 as either little- or big-endian, remove unnecessary special workaround. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30284 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_coreaudio.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) commit 33bc71f10d0218a99128b6a786357f8c60ba821e Author: reimar Date: Mon Jan 11 20:27:52 2010 +0000 Add support for distinguishing between little- and big-endian SPDIF AC3 and converting between both. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30283 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_format.c | 4 +++- libaf/af_format.h | 5 +++++ libaf/af_lavcac3enc.c | 4 ++-- libaf/format.c | 6 ++++-- libao2/ao_alsa.c | 11 +++++------ libao2/ao_alsa5.c | 8 ++------ libao2/ao_dsound.c | 5 ++++- libao2/ao_mpegpes.c | 7 ++++--- libao2/ao_oss.c | 6 ++++-- libao2/ao_pcm.c | 3 ++- libao2/ao_win32.c | 4 +++- libmpcodecs/ad_hwac3.c | 2 +- m_option.c | 4 +++- stream/tv.c | 1 - 14 files changed, 42 insertions(+), 28 deletions(-) commit d3ae3611ce366b7598c49094a94109c6ee504322 Author: reimar Date: Mon Jan 11 20:02:46 2010 +0000 More uses of AF_FORMAT_IS_AC3 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30282 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_dsound.c | 4 ++-- libao2/ao_win32.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit d4b1ff0d03c9047db196921ce97399782e9c4700 Author: reimar Date: Mon Jan 11 19:55:07 2010 +0000 Use AF_FORMAT_IS_AC3 in ao_oss.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30281 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_oss.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 92b91439e01656b1e00dfe9c86d1f36ae5446abe Author: reimar Date: Mon Jan 11 19:43:19 2010 +0000 Make ad_hwac3 independent of liba52. Needs a minor amount of code duplication, though that is already done that way for dts support in hwac3. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30280 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 4 +- libmpcodecs/ad_hwac3.c | 56 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 42 insertions(+), 18 deletions(-) commit e3c9e9a09b45ad660800d107265e0518df8d8ee9 Author: reimar Date: Mon Jan 11 19:40:58 2010 +0000 Use af_fmt2bits, it should give more sensible values than snd_pcm_format_physical_width, especially for AC3. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30279 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 76feee19c4b1e710f4619003244c31069b7d7e9e Author: reimar Date: Mon Jan 11 19:37:50 2010 +0000 Add a hack to af_fmt2bits to recognize AC3 as a 16-bit format, since this is more correct than 8 bit for alignment purposes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30278 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/format.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 10321db5c0a745ac827befb508417918ca6c9fb2 Author: reimar Date: Mon Jan 11 19:26:33 2010 +0000 Use af_fmt2bits instead of reimplementing it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30277 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_coreaudio.c | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) commit 6910cdaae18a9b97527ca0978a9b33a3e52866b1 Author: reimar Date: Mon Jan 11 19:23:18 2010 +0000 Add and use AF_FORMAT_IS_AC3 macro. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30276 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_format.h | 2 ++ libao2/ao_alsa.c | 9 +++++---- libao2/ao_coreaudio.c | 4 ++-- libao2/ao_dxr2.c | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) commit a8a53e872e32c131f74eabe9f612cabf899e6d7b Author: reimar Date: Mon Jan 11 19:08:15 2010 +0000 Revert r30170, AF_FORMAT_AC3 is supposed to be the special mask, and should not include other parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30275 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_format.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 849d578842c37d3b4c12cb35c44270719ce515a6 Author: compn Date: Mon Jan 11 11:16:09 2010 +0000 mark cfhdvfw decoder as working on windows only add ffmpeg sipr / acelp.net decoder as buggy until 16k is supported git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30274 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) commit 7c79acf4b2a05565cf944dde3e685813bd23c651 Author: zuxy Date: Mon Jan 11 08:21:31 2010 +0000 Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for multiple times. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30273 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/x86/yuv2rgb_template.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 83ff693d413b17269a65e385af421ee34a00ee5a Author: ramiro Date: Mon Jan 11 07:30:28 2010 +0000 cosmetics: {} placement. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30272 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit fe2e888fd6a6658c7a4c8ba317e3f06a9c65ce62 Author: reimar Date: Sun Jan 10 21:47:50 2010 +0000 Search X11 headers and libraries also in /usr/local/..., should ease compilation on FreeBSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30271 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 5c459408bd55cb3fcd50e9e597717f4b439a9219 Author: reimar Date: Sun Jan 10 21:22:44 2010 +0000 Do not use FreeBSD's cpuinfo file on x86_64 either, as on x86_32 it will not report 3Dnow availability. Patch from FreeBSD ports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30270 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 4ecd4741e61e4ba6e9c1a0659a7978c498cc0d5a Author: reimar Date: Sun Jan 10 20:32:19 2010 +0000 FFmpeg uses ifdef in Makefiles for CONFIG_MPEGAUDIO_HP and CONFIG_HARDCODED_TABLES. Change the config.mak generation to take that into account and not generate a definition for these if the features are disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30269 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit af6f08ce6ae77ecba16bea764ad3a193766e6d07 Author: reimar Date: Sun Jan 10 19:59:36 2010 +0000 Place a volatile at a more appropriate place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30268 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/win32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit acc53c9609db7f7d3dade8fac7e90d6f8b9a4733 Author: reimar Date: Sun Jan 10 19:58:01 2010 +0000 Change dummy value to fit into int. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30267 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/win32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c65994b907ad28e9a07c0589cbdb6d1a12139ceb Author: reimar Date: Sun Jan 10 19:52:59 2010 +0000 Remove return statement from function that has no return value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30266 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/win32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f10f9b572622a6d2aced91c56b508209054218a8 Author: reimar Date: Sun Jan 10 19:37:42 2010 +0000 Move mp3lib priority below libavcodec mp2/mp3 audio decoders. This is meant as a test to see if we can possibly remove mp3lib at some point. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30265 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) commit 4e50b6df73fd6aa3e426aba796f38b9357ea457b Author: reimar Date: Sun Jan 10 18:22:01 2010 +0000 Fix OpenGL detection for OpenSolaris where -lXdamage is necessary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30264 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) commit fff96519eeb241aee5dd98ef2354ecffdbcb2be7 Author: reimar Date: Sun Jan 10 16:00:07 2010 +0000 Only print "using sdl-config" if we actually used it for SDL detection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30263 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cbdb16328cc2dce293a8cd3800c37f9fbbe2c422 Author: reimar Date: Sun Jan 10 15:37:14 2010 +0000 Avoid excessive fflush in dbgprintf if we didn't even print anything. Patch by Steinar H. Gunderson [sgunderson bigfoot com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30262 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/win32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e89c898ac1193374f913bceb2067561cb6fd7425 Author: reimar Date: Sun Jan 10 15:31:45 2010 +0000 Fix RegCloseKey to not return an error on success. Patch by "Steinar H. Gunderson" [sgunderson bigfoot com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30261 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 07f7df3208a71e35167e5dfd418d6e304a56d795 Author: reimar Date: Sun Jan 10 14:03:10 2010 +0000 Call XSync after XShmAttach to avoid a possible race-condition with shmctl. Patch from FreeBSD ports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30260 b3059339-0415-0410-9bf9-f77b7e298cf2 gui/wm/ws.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 894acafa51fb23677fa6cb8b1c1ef9986f07dbea Author: reimar Date: Sun Jan 10 13:55:55 2010 +0000 Prefer libdca over libdts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30259 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 534f6aa6b5648c70a2cb4b880fd67c68370e4e86 Author: zuxy Date: Sun Jan 10 13:52:44 2010 +0000 Use !isspace() to replace isalnum() to avoid filename mismatch under MBCS locale like those in East Asia where most glyphs are neither alphabetical nor numerical. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30258 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit e51a1598b4615c7a6e0d31c91f917e5ef52006ad Author: reimar Date: Sun Jan 10 13:32:37 2010 +0000 Quote test arguments that may be empty git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30257 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 71670752d0c3ddd7844071b11ab2f1af245869e5 Author: reimar Date: Sun Jan 10 12:13:10 2010 +0000 Disable internal copy of liba52 by default, libavcodec should be an adequate replacement. If there are no complaints we should probably remove it within a few months. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30256 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7712ce86d868b748fa33094c0386105f06c96c98 Author: reimar Date: Sat Jan 9 18:29:28 2010 +0000 IPv6 in FFmpeg is not supported for MinGW, so do not set CONFIG_IPV6 for that case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30255 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ed8a43de8f4c3f57bed473c87d3de8a097ca8113 Author: zuxy Date: Sat Jan 9 17:20:49 2010 +0000 MMX(2) accelerated yuv420->rgb24 routine, trivial as essentially as it just swaps R and B inputs for the existing yuv420->bgr24 routine. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30254 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/x86/yuv2rgb_mmx.c | 6 +- libswscale/x86/yuv2rgb_template.c | 210 ++++++++++++++++++++----------------- 2 files changed, 118 insertions(+), 98 deletions(-) commit 9e5a65dcbe8ad7f819127917b557f6f4c2ae4abf Author: zuxy Date: Sat Jan 9 14:44:20 2010 +0000 Remove unused PREFETCHW macro git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30253 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/rgb2rgb_template.c | 4 ---- libswscale/swscale_template.c | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) commit 43d4fedf592a3bc86eacfff4219fd5046e440009 Author: reimar Date: Sat Jan 9 14:17:23 2010 +0000 Add several make variables to make --enable-hardcoded-tables actually compile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30252 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 13b9a208216e1c5b90b5d5236b967d173e9b3db9 Author: reimar Date: Sat Jan 9 13:39:26 2010 +0000 Add support for --enable-hardcoded-tables like FFmpeg has. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30251 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) commit a91c19964de606c8002531cbb87aa6de3d89508f Author: cehoyos Date: Sat Jan 9 11:33:06 2010 +0000 Fix MP1 with demuxer lavf in MPEG (PS) files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30250 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/mp_taglists.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 74423218b77881a9fac419b1652109ab2457bae4 Author: reimar Date: Sat Jan 9 11:32:18 2010 +0000 Fix fbdev2 to work with Intel framebuffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30249 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev2.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 52e2d23da6884de67df8ae41a75906ae7196094b Author: reimar Date: Sat Jan 9 11:26:39 2010 +0000 Fix vo_fbdev to also work with Intel framebuffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30248 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_fbdev.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) commit 0a411a89e9d43833385afcf7d4aa500fa74c0c95 Author: compn Date: Fri Jan 8 21:50:32 2010 +0000 add binary cineform hd vfw decoder to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30247 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit c8945742364cdf358e3583667817b68d9534135b Author: reimar Date: Fri Jan 8 19:31:33 2010 +0000 Ignore 0-height slice in sws_scale, otherwise a final 0-height slice will cause libswscale to assume the incorrect slice order and complain about slices starting in the middle. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30246 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 17da96da5b5b88addcb12878379d8db672147eda Author: reimar Date: Fri Jan 8 19:21:14 2010 +0000 vf crop: do not generate 0-size slices, they are pointless and also confuse libswscale to assume the wrong slice order. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30245 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_crop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 83da389dcec530bc2dd88bcd82dc7a99f97fd5b2 Author: greg Date: Fri Jan 8 18:56:39 2010 +0000 libass needs at least freetype 2.2.1 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30244 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit bb31a48a51fbd3bc38400bbeff575b0f8cfb6983 Author: compn Date: Fri Jan 8 18:44:34 2010 +0000 mark ffqclp as working in codecs.conf, works on all my samples git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30243 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9aea06cf7dde9592672e4dba09fb03b2b89d6863 Author: greg Date: Fri Jan 8 18:35:44 2010 +0000 Update internal libass copy to commit 8db4a5 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 3 + libass/ass.c | 1804 +++++++++-------- libass/ass.h | 307 +++- libass/ass_bitmap.c | 720 +++++--- libass/ass_bitmap.h | 30 +- libass/ass_cache.c | 440 ++-- libass/ass_cache.h | 190 +- libass/ass_cache_template.h | 122 ++ libass/ass_drawing.c | 495 +++++ libass/ass_drawing.h | 77 + libass/ass_font.c | 673 ++++--- libass/ass_font.h | 60 +- libass/ass_fontconfig.c | 751 ++++---- libass/ass_fontconfig.h | 20 +- libass/ass_library.c | 146 +- libass/ass_library.h | 30 +- libass/ass_parse.c | 926 +++++++++ libass/ass_parse.h | 38 + libass/ass_render.c | 4661 ++++++++++++++++++++++--------------------- libass/ass_render.h | 262 +++ libass/ass_strtod.c | 247 +++ libass/ass_types.h | 172 +- libass/ass_utils.c | 236 ++- libass/ass_utils.h | 139 +- 24 files changed, 7767 insertions(+), 4782 deletions(-) commit f51c039c5fcdc24c3f33e1a48bed73bdb17e9e11 Author: cehoyos Date: Fri Jan 8 18:19:10 2010 +0000 Cosmetics: Fix indentation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30241 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/wishlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 05fb845e5ff3a3494710f9a92b872dc5bc6bf684 Author: cehoyos Date: Fri Jan 8 18:18:43 2010 +0000 QCELP is part of libavcodec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30240 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/wishlist | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 699e0c888bd6120a771ca5a4a375a63a229a8d5f Author: greg Date: Fri Jan 8 18:07:12 2010 +0000 Fix libass API checks libass API changed in 0.9.7, not 0.9.8. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30239 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 2 +- libass/ass_mp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit fd9124901398e33c93ec8ba0d5e66f0c1c6ffadb Author: compn Date: Fri Jan 8 15:36:38 2010 +0000 update wishlist git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30238 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/wishlist | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit b67497a5b0d781a3689691b17ef6da0fac3354ab Author: jrash Date: Fri Jan 8 11:25:18 2010 +0000 sync with en/mplayer.1 r30197 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30237 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) commit 23e693d6d2e6d0da74b40ccb8a9f438a9dd846c2 Author: Uoti Urpala Date: Fri Jan 8 02:52:35 2010 +0200 taglists.c: update to match current libavformat riff.c ffmpeg_files/taglists.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) commit 819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781 Merge: 3488fca 3f1a03f Author: Uoti Urpala Date: Fri Jan 8 02:44:37 2010 +0200 Merge svn changes up to r30236 commit 3488fcafe6709337b25a742999a03d04d561f419 Merge: 852570d 5e1b88a Author: Uoti Urpala Date: Fri Jan 8 02:40:33 2010 +0200 Ignore svn changes r30217, r30218 Already done better in git. commit 852570d342943894f109e2dbd281237a369bcceb Merge: d1f0cbe a7a1f39 Author: Uoti Urpala Date: Fri Jan 8 02:39:39 2010 +0200 Merge svn changes up to r30216 commit d1f0cbe5c8628d206fb0337835b0a7e99e7acc10 Merge: 8278040 da13681 Author: Uoti Urpala Date: Fri Jan 8 02:34:05 2010 +0200 Merge svn r30200 (reindent configure) commit 82780406d1dd7de3c465ab59e7b26e83b15b4a26 Merge: 750748c 0e32248 Author: Uoti Urpala Date: Fri Jan 8 02:08:51 2010 +0200 Merge svn changes up to r30199 commit 750748c0c49dab165c6c9b64978a3404febc243b Merge: 17eb7f2 c631f7b Author: Uoti Urpala Date: Fri Jan 8 02:07:31 2010 +0200 Ignore svn r30196 commit 17eb7f2c4bb070d9477792fcbd4a5120ee1a789c Merge: ff3ef4e eb6fc7e Author: Uoti Urpala Date: Fri Jan 8 02:06:42 2010 +0200 Merge svn changes up to r30195 commit ff3ef4e7827424db7444cdb7973faa499e054ac5 Author: Uoti Urpala Date: Fri Jan 8 01:55:42 2010 +0200 vo_png: add missing "#include "fmt-conversion.h" fmt-conversion.h is needed for imgfmt2pixfmt(). libvo/vo_png.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit ba21aba40d4217f7efb8fee8eb9138fcef8c02bd Merge: b390b9b 6da1778 Author: Uoti Urpala Date: Fri Jan 8 01:54:09 2010 +0200 Merge svn changes up to r30187 commit b390b9b28fa6280f355eeef4811b6cfc02dea01a Merge: efe742e 8e778e5 Author: Uoti Urpala Date: Fri Jan 8 01:36:05 2010 +0200 Merge svn changes up to r30185 commit efe742e3fa08f007ab41f1d666fd1f1c3bf0d63a Merge: d157b2a 2e557e3 Author: Uoti Urpala Date: Fri Jan 8 01:22:11 2010 +0200 Merge svn r30174 commit d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec Merge: dd0bab9 1d3fd9e Author: Uoti Urpala Date: Fri Jan 8 01:17:56 2010 +0200 Merge svn changes up to r30173 commit dd0bab9239fb1be1df856205d6a5c085910e0ae8 Merge: 231b33a c1d166b Author: Uoti Urpala Date: Fri Jan 8 01:07:03 2010 +0200 Ignore svn change r30166 commit 231b33a02fae95b260120349040106bfa34a3750 Merge: 52126e5 92cd6dc Author: Uoti Urpala Date: Fri Jan 8 01:05:30 2010 +0200 Merge svn changes up to r30165 commit 3f1a03feb15344188a8213854246d42db38314ac Author: stefano Date: Thu Jan 7 19:07:47 2010 +0000 Implement sws_isSupportedInput() and sws_isSupportedOutput(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30236 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 12 ++++++++++++ libswscale/swscale.h | 16 ++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) commit 0d3adaac4b00282b2bad126d4be07d093d22ceb3 Author: zuxy Date: Thu Jan 7 11:12:58 2010 +0000 Happy new year! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30235 b3059339-0415-0410-9bf9-f77b7e298cf2 osdep/mplayer.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0c7fcdd42e6ad557a4ab63d4ef4191401cdac4a8 Author: zuxy Date: Thu Jan 7 07:13:18 2010 +0000 Remove const to avoid a bunch of GCC warnings against discarded qualifiers and incompatible pointer type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30234 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/x86/yuv2rgb_template.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 554231067da1c2aaa65639b62fed3ee0b89667c6 Author: zuxy Date: Thu Jan 7 04:59:50 2010 +0000 Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30233 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 78267a4d210cd374c49aa6a56f8e3a16e0aad4b5 Author: reimar Date: Wed Jan 6 16:12:58 2010 +0000 Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_ffmpeg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit abb06b3f11714de8b59f2482a9aec6447653f997 Author: reimar Date: Wed Jan 6 16:11:29 2010 +0000 Simplify ffmpeg stream support, we (so far) do not need any special option parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30231 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_ffmpeg.c | 32 +++----------------------------- 1 files changed, 3 insertions(+), 29 deletions(-) commit c94c8d30812bdec972f64b94c3e77823830a0490 Author: compn Date: Wed Jan 6 03:44:24 2010 +0000 add MVLZ and MVDV binary decoders to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30230 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 3dfee062b1deea85676710aa1b559b6d1ee81c47 Author: compn Date: Tue Jan 5 20:12:06 2010 +0000 map zjpeg to ffmjpeg in codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30229 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 41486125799e648ca07b1c4c237664d19e19db8e Author: compn Date: Tue Jan 5 20:04:44 2010 +0000 add blox binary codec to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30228 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 4d213f46a892707b4dc0111420be2a880b131c6e Author: compn Date: Tue Jan 5 19:12:25 2010 +0000 add three ADV1 binary codecs to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30227 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) commit f80ece49a89ceceb4ae3f81f8026fc9858dab291 Author: diego Date: Tue Jan 5 10:54:41 2010 +0000 Move MatrixView video output check below OpenGL check, it depends on OpenGL. patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30226 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) commit 46206e2b28860461af3a7b870ca97038357bfc5a Author: diego Date: Tue Jan 5 10:52:12 2010 +0000 vo_png now depends on libavcodec, not libpng. patch by Emanuele Giaquinta, emanuele.giaquinta gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30225 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/video_out.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cec22660c74458277718795a262d0e05120fc864 Author: reimar Date: Tue Jan 5 05:43:33 2010 +0000 Change license terms for matrixview to GPLv2 "or later", all known authors have agreed to it, and current upstream (matrixgl.sourceforge.net) was already relicensed as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30224 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/matrixview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit c202adb9f46dcf4ffeff4f508b7e32957fdf24f6 Author: diego Date: Mon Jan 4 22:32:28 2010 +0000 Remove pointless variable declaration from DirectFB check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30223 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e4ce50305bb4985005ff9e7e0d03c1cf8516bee7 Author: diego Date: Mon Jan 4 22:30:41 2010 +0000 Add missing stdlib.h #include to fribidi check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30222 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 22298a8e570b35e9626b22020ce70fa1f89b4220 Author: diego Date: Mon Jan 4 22:29:55 2010 +0000 Remove pointless printf call in libmp3lame test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30221 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ff44ac1a3c5e8cfde01c58e493ff12880ecc748b Author: diego Date: Mon Jan 4 22:28:44 2010 +0000 Pass proper parameters to dlopen/dlsym/vsscanf to avoid configure test warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30220 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 09b8d9402fc6039b60358b529b4afdaddc4a72d4 Author: diego Date: Mon Jan 4 21:57:13 2010 +0000 Pass a proper va_list type to vsscanf() test in configure. This fixes the check on SuperH with CodeSourcery compilers. patch by Bill Traynor, wmat naoi ca git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30219 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5e1b88a019de70b93b280f263ccbd1dbd8a0dce0 Author: reimar Date: Mon Jan 4 21:38:45 2010 +0000 At startup and while seeking avoid to introduce pointless sleeps and possibly desync due to codec delay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30218 b3059339-0415-0410-9bf9-f77b7e298cf2 mp_core.h | 2 ++ mplayer.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) commit e57a8e10402a350f5bbbbe0769fd64e0e4e0986a Author: reimar Date: Mon Jan 4 21:27:08 2010 +0000 Also reset time_frame and next_frame_time on reset, it makes no sense to process the sleep before playing the frame seeked to and can be annoying when the user tries to escape a series of "stuck" frames with a huge duration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30217 b3059339-0415-0410-9bf9-f77b7e298cf2 mp_core.h | 3 +++ mplayer.c | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) commit a7a1f395c6b883b34aeaf008c0d22d6fe3dcd1c8 Author: diego Date: Mon Jan 4 21:22:33 2010 +0000 Invoke pci_db2c.awk as an argument to awk instead of letting the shell run it. The shell looks for awk in /usr/bin, the path from the shebang line. However, there exist systems with awk in /bin, namely archlinux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30216 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 01ced9c82ce292357a083151f278d0b0b0d368fe Author: diego Date: Mon Jan 4 21:10:15 2010 +0000 cosmetics: Break multiple statements on one line apart. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30215 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 50 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 17 deletions(-) commit bf258cb6758553cfc8bdf554572061f612651082 Author: diego Date: Mon Jan 4 20:53:57 2010 +0000 Remove previous failed attempt at disabling that auto-generation of some C code. This reverts the previous buggy commit, r30094. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30214 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- vidix/pci_db2c.awk | 54 +++++++++++++++++++++++++++++++++++++++++++-------- vidix/pci_names.c | 50 ------------------------------------------------ 3 files changed, 46 insertions(+), 60 deletions(-) commit dec1227f1cf98ffb6fc2c8b9fdaac535eda6e496 Author: diego Date: Mon Jan 4 20:36:27 2010 +0000 Add required header #includes to satisfy 'make checkheaders'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30213 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/dmo/DMO_AudioDecoder.h | 3 +++ loader/dmo/DMO_VideoDecoder.h | 3 +++ loader/dshow/DS_AudioDecoder.h | 3 +++ loader/dshow/DS_VideoDecoder.h | 3 +++ loader/registry.h | 2 ++ loader/wine/objbase.h | 2 ++ loader/wine/vfw.h | 2 ++ loader/wine/winuser.h | 1 + 8 files changed, 19 insertions(+), 0 deletions(-) commit a4ce4a23b7a74229e12930c68d182a698976305a Author: diego Date: Mon Jan 4 20:32:23 2010 +0000 Drop -Iloader from CPPFLAGS for the loader subdirectory. Instead use full relative paths in #includes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30212 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- loader/dmo/DMO_AudioDecoder.c | 4 ++-- loader/dmo/DMO_VideoDecoder.c | 12 ++++++------ loader/dmo/buffer.c | 4 ++-- loader/dmo/dmo.c | 6 +++--- loader/dmo/dmo.h | 4 ++-- loader/dmo/dmo_guids.h | 2 +- loader/dshow/DS_AudioDecoder.c | 2 +- loader/dshow/DS_Filter.c | 6 +++--- loader/dshow/DS_VideoDecoder.c | 6 +++--- loader/dshow/allocator.c | 4 ++-- loader/dshow/cmediasample.c | 2 +- loader/dshow/guids.h | 8 ++++---- loader/dshow/inputpin.c | 2 +- loader/dshow/interfaces.h | 2 +- loader/dshow/libwin32.h | 8 ++++---- loader/dshow/mediatype.c | 4 ++-- loader/dshow/outputpin.c | 4 ++-- loader/qtx/list.c | 2 +- loader/qtx/qtxload.c | 2 +- 20 files changed, 43 insertions(+), 43 deletions(-) commit cdcbe65d478491a33cced1fce0fc6dc89ec2d210 Author: diego Date: Mon Jan 4 19:56:28 2010 +0000 Add loader/wine/ to DIRS; its headers should be part of checkheaders. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30211 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 7e2c59fc130a083039c5bcf619d670a7f9ea3f34 Author: diego Date: Mon Jan 4 19:49:42 2010 +0000 Add missing config.h #include. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30210 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 64ff3434c09ea189ebc90df6eb59ac07a8f90e68 Author: diego Date: Mon Jan 4 19:36:18 2010 +0000 Refactor real --> float #define to a typedef in a common header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30209 b3059339-0415-0410-9bf9-f77b7e298cf2 mp3lib/dct36_3dnow.c | 3 +-- mp3lib/dct64_3dnow.c | 2 +- mp3lib/dct64_altivec.c | 2 -- mp3lib/dct64_k7.c | 2 +- mp3lib/dct64_mmx.c | 2 +- mp3lib/dct64_sse.c | 3 +-- mp3lib/decode_i586.c | 2 +- mp3lib/decode_mmx.c | 2 +- mp3lib/l2tables.h | 2 ++ mp3lib/layer1.c | 2 +- mp3lib/layer2.c | 2 +- mp3lib/layer3.c | 2 ++ mp3lib/mpg123.h | 2 ++ mp3lib/sr1.c | 3 --- mp3lib/tabinit.c | 2 ++ 15 files changed, 17 insertions(+), 16 deletions(-) commit 620ab707450f76b1c94017109386078817c7e3ff Author: diego Date: Mon Jan 4 19:04:33 2010 +0000 Add missing header #includes to fix 'make checkheaders'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30208 b3059339-0415-0410-9bf9-f77b7e298cf2 fmt-conversion.h | 1 + libvo/font_load.h | 2 ++ libvo/x11_common.h | 1 + loader/qt_fv.h | 2 ++ 4 files changed, 6 insertions(+), 0 deletions(-) commit 00ad5d3fed36de56bb690375a209cdcd31b12ecc Author: diego Date: Mon Jan 4 18:58:35 2010 +0000 Add a few missing header #includes and #defines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30207 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cdd.h | 1 + stream/dvbin.h | 1 + stream/stream.h | 1 + stream/stream_netstream.h | 1 + stream/stream_radio.h | 1 + stream/vcd_read_darwin.h | 2 ++ stream/vcd_read_fbsd.h | 4 ++++ stream/vcd_read_win32.h | 3 +++ 8 files changed, 14 insertions(+), 0 deletions(-) commit ebe968283187d6ef1acab2ef4e511250bef6bc0f Author: diego Date: Mon Jan 4 15:14:21 2010 +0000 Remove unused variable; fixes the warning: libvo/csputils.c:67: warning: unused variable 'yuv_tv_level_adjust' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30206 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/csputils.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 30c98f487734928696963064bb7eb610a7072a1d Author: diego Date: Mon Jan 4 14:42:59 2010 +0000 Add multiple inclusion guards to all mp3lib headers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30205 b3059339-0415-0410-9bf9-f77b7e298cf2 mp3lib/huffman.h | 5 ++++- mp3lib/l2tables.h | 4 ++++ mp3lib/mp3.h | 4 ++++ mp3lib/mpg123.h | 5 +++++ 4 files changed, 17 insertions(+), 1 deletions(-) commit 0a1e9b2902d623aa616658fd900c5350586c4a0e Author: diego Date: Mon Jan 4 13:13:10 2010 +0000 Add missing config.h #include; remove a redundant one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30204 b3059339-0415-0410-9bf9-f77b7e298cf2 gui/cfg.h | 2 ++ gui/mplayer/play.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4ae9751ee6f141e6655178afdd19c7fcdf86a24e Author: diego Date: Mon Jan 4 13:05:52 2010 +0000 Add missing license headers for vo_matrixview code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30203 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/matrixview.h | 18 ++++++++++++++++++ libvo/matrixview_font.h | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) commit 55c7b19ae1ba5fa39f4fb003e36fa6a730f46ae7 Author: diego Date: Mon Jan 4 13:05:05 2010 +0000 Refer to MatrixView instead of MPlayer in code taken from MatrixView. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30202 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/matrixview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b1037d87ee9d0517163b22c231ff54e7d0ae33a6 Author: diego Date: Mon Jan 4 13:01:44 2010 +0000 Clarify which version of the GPL applies to MPlayer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30201 b3059339-0415-0410-9bf9-f77b7e298cf2 Copyright | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) commit da13681a2186f853389fa3fa1da47be358442ddc Author: diego Date: Mon Jan 4 12:24:07 2010 +0000 cosmetics: tabs to spaces, some reindentation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30200 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1012 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 506 insertions(+), 506 deletions(-) commit 0e3224805ad54fbdca64a78d5084138862ddfe33 Author: diego Date: Mon Jan 4 12:12:57 2010 +0000 Fix fribidi check to avoid spamming the console with error messages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30199 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 36e760f9d9f4dfb90f3625d30ccc5049537a52aa Author: reimar Date: Mon Jan 4 11:58:56 2010 +0000 Remove ARGB support from matrixview vo, it is quite pointless and causes compilation failure on big-endian. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30198 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_matrixview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 7ee42c3192cc7bbfaa7ffafc86c1534db8a3ab82 Author: diego Date: Mon Jan 4 11:14:47 2010 +0000 Fix a few typos in the matrixview section. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30197 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit c631f7bfa33626c7b26a434cd4de620dcba13a56 Author: diego Date: Mon Jan 4 11:13:49 2010 +0000 Add a few definitions used by FFmpeg to config.h: CONFIG_IPV6, HAVE_SETMODE, HAVE_SYS_SELECT_H git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30196 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit eb6fc7e99e07712b74c17c917aa33704ef6e410a Author: diego Date: Mon Jan 4 10:24:10 2010 +0000 prettyprinting cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30195 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/matrixview.c | 22 ++++++---- libvo/matrixview.h | 4 +- libvo/vo_matrixview.c | 111 ++++++++++++++++++++++++------------------------- 3 files changed, 71 insertions(+), 66 deletions(-) commit 348a61a71f5d56572f1f8fca34af8a160c929d9b Author: diego Date: Mon Jan 4 09:48:14 2010 +0000 Disambiguate HEADER_SIZE definition in stream/librtsp and stream/realrtsp. This fixes the warning: In file included from stream/realrtsp/real.c:35: stream/realrtsp/real.h:36:1: warning: "HEADER_SIZE" redefined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30194 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/librtsp/rtsp.h | 2 +- stream/librtsp/rtsp_session.c | 2 +- stream/realrtsp/real.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) commit fb26608318947b76908eec3d781f90c4f7548368 Author: reimar Date: Sun Jan 3 18:44:56 2010 +0000 Make vo gl print the OpenGL vendor and version strings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30193 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit ef395a2f08e0f96d8ae5f819927b17aa88000ecb Author: reimar Date: Sun Jan 3 17:12:12 2010 +0000 Replace deprecated sws_scale_ordered usages by sws_scale (which does the same). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30192 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 6 +++--- libmpcodecs/vf_screenshot.c | 4 ++-- libvo/vo_aa.c | 4 ++-- libvo/vo_vesa.c | 4 ++-- libvo/vo_x11.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) commit 3b34c5517852c13a76fe6f3af5848b4390ef74b2 Author: reimar Date: Sun Jan 3 17:04:04 2010 +0000 Avoid memleaks when vo_direct3d initialization fails. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30191 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_direct3d.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) commit f31ed10742a2f195629b98bce6470c0aaa2bf232 Author: reimar Date: Sun Jan 3 17:00:51 2010 +0000 Modify -vo direct3d so we do not have to link against d3d9.dll, it might not be available on some rare systems. Based on patch used for builds by Gianluigi Tiesi [sherpya netfarm it] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30190 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 +-- libvo/vo_direct3d.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) commit 37f93a57e5116b0f0b88b835ee7106495a113688 Author: reimar Date: Sun Jan 3 16:51:56 2010 +0000 Some Changelog updates. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30189 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) commit 9e7e04add6b2abf0fd5cf70b3b1b5423712532ec Author: reimar Date: Sun Jan 3 16:46:31 2010 +0000 Enable all FFmpeg protocols by default, they seem to build without issue on Linux and MinGW, lets see if it works for everything else as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30188 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6da17782ea42b89271a794f20837c76657161eb2 Author: reimar Date: Sun Jan 3 16:39:16 2010 +0000 100l, vo_png must go in SRCS_MPLAYER, not SRCS_COMMON. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30187 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit eff2254d58471554ede824897300cac6fe910cdf Author: reimar Date: Sun Jan 3 16:26:30 2010 +0000 Change vo_png to use FFmpeg's png encoder instead of libpng. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- configure | 2 - libvo/vo_png.c | 157 ++++++++++++++++---------------------------------------- 3 files changed, 45 insertions(+), 116 deletions(-) commit 8e778e501948b67b1f8cd889e68242d1a1eb6041 Author: reimar Date: Sun Jan 3 15:56:33 2010 +0000 Add missing avcodec_close to vf_screenshot. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30185 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_screenshot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 763360ccad0c074297493378e8c90d11f9a184b0 Author: stefano Date: Sun Jan 3 15:20:07 2010 +0000 Prefer enum PixelFormat over int for the type of the format parameter of getSubSampleFactors(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30184 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2f228574be9d75a816840bbd4695c346cca5e5b8 Author: reimar Date: Sun Jan 3 14:55:15 2010 +0000 Basic -vo matrixview documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30183 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) commit a7be2e180bedebbf684514155869982ae72254c3 Author: reimar Date: Sun Jan 3 14:54:51 2010 +0000 Finally add matrixview vo. Heavily cleaned up/fixed etc. by me, improvements are still possible though. Patch originally by Pigeon git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 1 + configure | 18 ++ libvo/matrixview.c | 378 ++++++++++++++++++++++++++++++ libvo/matrixview.h | 12 + libvo/matrixview_font.h | 588 +++++++++++++++++++++++++++++++++++++++++++++++ libvo/video_out.c | 4 + libvo/vo_matrixview.c | 333 +++++++++++++++++++++++++++ 7 files changed, 1334 insertions(+), 0 deletions(-) commit 1ebc2cbbd87deaf4306a963a1ff313a2076ec694 Author: reimar Date: Sun Jan 3 14:44:45 2010 +0000 Document -vo gl colorspace suboption. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30181 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) commit e8d92b1e6670dc69564088677c468184a45ed052 Author: stefano Date: Sun Jan 3 14:35:20 2010 +0000 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for the swscale_configuration() and swscale_license() functions, consistent with the rest of FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30180 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 4 ++-- libswscale/swscale.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit f06aa83a83f9d8a1a41424c37b115d0b9491ac8d Author: reimar Date: Sun Jan 3 12:55:09 2010 +0000 Add pointers to a few more standard OpenGL functions to ease future extensions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30179 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 22 ++++++++++++++++++++++ libvo/gl_common.h | 11 +++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) commit c23a01e2600ec77f857bcfb3459a9138baea8aff Author: reimar Date: Sun Jan 3 11:33:33 2010 +0000 Fixup SDL configure check: - Make it work without sdl-config which adds at least useless or even hurtful cflags and also does not work for cross-compiling - If using sdl-config, make it use the CFLAGS we actually use for compiling instead of something else. Thus #undef main is needed in the test program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 45 +++++++++++++++++++++++++++++++++------------ libao2/ao_sdl.c | 4 ++++ libvo/vo_sdl.c | 4 ++++ mplayer.c | 4 ++++ 4 files changed, 45 insertions(+), 12 deletions(-) commit 485b17cc7d419336c0244ab2594a0c00c16eec87 Author: reimar Date: Sun Jan 3 09:20:01 2010 +0000 Do not assume that "long" is the size of a register. Fixes aclib compilation on mingw64 (with --enable-runtime-cpudetection). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30177 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/aclib.c | 2 ++ libvo/aclib_template.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) commit 4a981bf09aa13f3165e715ebe2c2658ce14d8aff Author: reimar Date: Sun Jan 3 09:11:20 2010 +0000 Also detect fontconfig when it requires -liconv git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30176 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ec0c6d2a912af5df21b455b12f12408c1e1ae858 Author: reimar Date: Sun Jan 3 01:00:21 2010 +0000 Change fribidi check to also work without fribidi-config. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30175 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) commit 2e557e3b28add84c060abfae0b7241897be073eb Author: reimar Date: Sun Jan 3 00:58:56 2010 +0000 Add support for JPEG2000 via FFmpeg/OpenJPEG git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 1 + configure | 29 +++++++++++++++++++++++++++++ etc/codecs.conf | 10 ++++++++++ libmpdemux/demux_mf.c | 2 ++ 4 files changed, 42 insertions(+), 0 deletions(-) commit 1d3fd9e1ea720c23076268cb69fa2c4245dd9109 Author: reimar Date: Sun Jan 3 00:50:15 2010 +0000 Also support decoding of 8-bit-per-component dpx files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30173 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e786fb79c5a57badc6b9f02d54a9a3c0e54e8ff3 Author: stefano Date: Sun Jan 3 00:22:49 2010 +0000 Simplify usePal() macro, make it use av_pix_fmt_descriptors. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30172 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) commit f192bfea2a434a6f53e149a5673c990725049add Author: stefano Date: Sun Jan 3 00:09:24 2010 +0000 Simplify getSubSampleFactors(), make it use the values provided by av_pix_fmt_descriptors(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30171 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 49 ++----------------------------------------------- 1 files changed, 2 insertions(+), 47 deletions(-) commit 13fe3d4986be4e4b3abda207923677adfaa2ca35 Author: reimar Date: Sat Jan 2 20:45:27 2010 +0000 Mark AC3 as 16-bit format, this simplifies alignment calculation and fixes hwac3 with ALSA reportedly broken by r29750. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30170 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/af_format.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 12760fc513cb66f0fd39536c35a5898b6cc19498 Author: reimar Date: Sat Jan 2 17:41:11 2010 +0000 Several hacks to fix compilation of tvi_dshow on MinGW64. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/wine/basetsd.h | 4 ++-- loader/wine/winnt.h | 7 ++++--- stream/tvi_dshow.c | 5 +++++ stream/tvi_dshow.h | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) commit f4f37e555a0fd2041009cbf431ea9ec58203f5de Author: reimar Date: Sat Jan 2 16:55:41 2010 +0000 Fix typo in code disabling VIDIX on mingw64 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30168 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit bb99b3f6402fcf7055e9f5bdbd18b8c7fe8770a6 Author: reimar Date: Sat Jan 2 16:47:26 2010 +0000 Disable vidix on 64 bit MinGW compiles, it seems to fail compiling and certainly was never tested. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30167 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit c1d166be18a2cabbe0df2a1c6a704f04a97137cd Author: reimar Date: Fri Jan 1 18:51:59 2010 +0000 Fix compilation if FreeType is not available, in particular do not try to build libass and use the internal ass.h as a stub for structs needed for EOSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 ++ libass/ass_mp.h | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) commit 52126e574c7872ca95e7974cfe5445421b74f24c Author: Uoti Urpala Date: Fri Jan 1 18:42:52 2010 +0200 demux_mkv: improve seeking with generated index When using generated index (-idx / -forceidx) the Matroska seeking code first guessed a file position using bitrate-based heuristics, then located the cluster nearest to that file position. Change it to store cluster timestamps in addition to file positions and seek to the cluster with the closest timestamp. This makes seeking with -idx a lot more accurate. This change also fixes a crash when trying to seek with generated index before playing any data from the beginning of the file (could be triggered by -idx together with ordered chapters or -ss for example). I removed the code handling MATROSKA_ID_CUES in the middle of parsing clusters. Such cue entries were not consistently handled if encountered during playback instead of index creation and the seek code was also buggy when they were encountered and parsed; i didn't consider it worth the effort to fix it. libmpdemux/demux_mkv.c | 115 +++++++++++++++++++++++++++++------------------- 1 files changed, 69 insertions(+), 46 deletions(-) commit 92cd6dc3e916ae4275ff05d2b238fc778cfbfc6b Author: reimar Date: Fri Jan 1 13:23:16 2010 +0000 Simplify range-checking functions for subopt parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30165 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 4 +--- libvo/vo_jpeg.c | 4 +--- libvo/vo_png.c | 4 +--- subopt-helper.c | 8 ++------ 4 files changed, 5 insertions(+), 15 deletions(-) commit f102ac7a8c62491761b7b3d32baa87dcb665f9ed Author: reimar Date: Fri Jan 1 13:18:49 2010 +0000 Fix function declarations to avoid casting function pointers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_alsa.c | 5 +++-- libao2/ao_dart.c | 2 +- libvo/vo_gl.c | 10 +++++----- libvo/vo_gl2.c | 2 +- libvo/vo_ivtv.c | 2 +- libvo/vo_jpeg.c | 11 ++++++----- libvo/vo_png.c | 5 +++-- libvo/vo_pnm.c | 2 +- libvo/vo_v4l2.c | 2 +- libvo/vo_xv.c | 4 ++-- libvo/vo_xvmc.c | 4 ++-- libvo/vo_zr2.c | 10 ++++++---- subopt-helper.c | 6 ++++-- subopt-helper.h | 4 ++-- 14 files changed, 38 insertions(+), 31 deletions(-) commit 5f684e1b32cc052edf33d8c0ff5ead106e98e680 Author: reimar Date: Fri Jan 1 12:54:09 2010 +0000 Slightly generalize code to generate YUV->RGB conversion table and add XYZ->RGB conversion as an example for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30163 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/csputils.c | 56 +++++++++++++++++++++++++++++++++-------------------- libvo/csputils.h | 1 + libvo/vo_gl.c | 1 + 3 files changed, 37 insertions(+), 21 deletions(-) commit 85344073fa9d45db689dc2529f1c48c889d84cc1 Author: jrash Date: Fri Jan 1 12:53:28 2010 +0000 sync with en/mplayer.1 r30135 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30162 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 64502716566cc7a9da4655ddd1fc6b442db47670 Author: reimar Date: Fri Jan 1 12:47:43 2010 +0000 Make YUV->RGB conversion coefficients selectable for -vo gl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30161 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) commit 17c214c820d7c96541561f8741f84fae7d0e350a Author: reimar Date: Fri Jan 1 09:46:24 2010 +0000 Do not needlessly use the BP register in x86_64-specific code, there are enough other registers available that are less likely to cause issues. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30160 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 0eb6b9aa95c0546313a3d5351378aab45dccca5e Author: reimar Date: Fri Jan 1 01:25:35 2010 +0000 One more fix for -vf scale with alpha. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30159 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c0cae7b3275b81d539f3d11fe64687ed6294ebfe Author: reimar Date: Fri Jan 1 01:06:34 2010 +0000 Also pass alpha plane to swscale, avoids crashes when converting between YUV with alpha and some other format supporting alpha. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30158 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 8afc25d710d8520b454d48b7744dde4812feef74 Author: reimar Date: Thu Dec 31 23:45:07 2009 +0000 Add support for YUV format with alpha and fix the codecs.conf entry for vp6a to use it. Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 b3059339-0415-0410-9bf9-f77b7e298cf2 codec-cfg.c | 1 + etc/codecs.conf | 2 +- fmt-conversion.c | 3 +++ libmpcodecs/img_format.c | 4 ++++ libmpcodecs/img_format.h | 4 ++++ libmpcodecs/mp_image.c | 8 +++++--- libmpcodecs/mp_image.h | 2 ++ libmpcodecs/vf_scale.c | 2 ++ m_option.c | 1 + 9 files changed, 23 insertions(+), 4 deletions(-) commit c07dec1a4a6e6e0695f3893c60a42e9a14daefaf Author: reimar Date: Thu Dec 31 23:39:21 2009 +0000 Also pass the 4th plane for planar formats on to libavcodec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30156 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 0ff930da825b29fc0e7c9955c33695dbe784dbb3 Author: reimar Date: Thu Dec 31 23:25:21 2009 +0000 Try to put the list of output formats for vf_scale in a more sensible order. While the 16-bit yuv formats should not be preferred over the 8-bit ones, it seems reasonable to probe them directly after the equivalent 8-bit formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30155 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit a994808e314ae5d3124e600bf233388c2feea21e Author: reimar Date: Thu Dec 31 23:09:35 2009 +0000 Deduplicate the mp_image planes allocation code. The code in vf.c and mp_image.c is almost the same, though the one in vf.c is more up-to-date/has more bug fixes and thus is used as the basis (which is why the diff is so big). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30154 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/mp_image.c | 58 ++++++++++++++++++++++++++++------------------- libmpcodecs/vf.c | 40 +-------------------------------- 2 files changed, 35 insertions(+), 63 deletions(-) commit 2150bddc743b27ad425a3f2388f8b97005ce74ab Author: reimar Date: Thu Dec 31 22:53:51 2009 +0000 Add support for FFmpeg's ffv210 codec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30153 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit a326622304cedacce34b31f47dafe7069e076e01 Author: reimar Date: Thu Dec 31 22:53:25 2009 +0000 Add support for 16-bit per component YUV formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2 codec-cfg.c | 9 +++++++++ fmt-conversion.c | 6 ++++++ libmpcodecs/img_format.c | 21 ++++++++++++++++++++- libmpcodecs/img_format.h | 20 ++++++++++++++++++++ libmpcodecs/mp_image.c | 13 +++++++------ libmpcodecs/mp_image.h | 6 ++++++ libmpcodecs/vf.c | 15 ++++++++------- libmpcodecs/vf_scale.c | 12 ++++++++++++ libvo/gl_common.c | 19 ++++++++++++++++--- libvo/vo_gl.c | 3 ++- libvo/vo_gl2.c | 3 ++- m_option.c | 9 +++++++++ 12 files changed, 117 insertions(+), 19 deletions(-) commit 498ad7ba573b80ac8740886b46f9f8e660647858 Author: reimar Date: Thu Dec 31 19:59:58 2009 +0000 First steps to supporting different YUV->RGB conversion definitions. The numbers are possibly still wrong though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30151 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/csputils.c | 46 ++++++++++++++++++++++++++++++++++++++-------- libvo/csputils.h | 10 ++++++++++ libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- 4 files changed, 50 insertions(+), 10 deletions(-) commit 0ecf324ac56d58230bcd34faecd92d8749f090a6 Author: reimar Date: Thu Dec 31 18:25:35 2009 +0000 Extract functions to generate yuv->rgb matrices and lookup tables into a separate file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- libvo/csputils.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++ libvo/csputils.h | 45 ++++++++++++++++++++ libvo/gl_common.c | 107 +++---------------------------------------------- libvo/gl_common.h | 11 +----- 5 files changed, 169 insertions(+), 112 deletions(-) commit c4c806a9d743ec917450515db15b270981930259 Author: reimar Date: Thu Dec 31 18:07:37 2009 +0000 Put the colourspace-related variables into a separate struct to ease extracting the code and sharing with other vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 20 ++++++++++---------- libvo/gl_common.h | 11 ++++++++--- libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) commit 8fb7d45abd13b0d8a427f44f19e338d8b4fb9cc0 Author: reimar Date: Thu Dec 31 16:47:53 2009 +0000 Make code slightly more readable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30148 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b78313acd8890b2f2181efb92273ae80264a38c1 Author: reimar Date: Thu Dec 31 16:46:44 2009 +0000 Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30147 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 54e6b786f41a9803f4c5c311ec7b310dad2acc16 Author: reimar Date: Thu Dec 31 11:29:21 2009 +0000 More readable fourcc for ffflac git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30146 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3ad06dd7d2fb381670a741c769401501c10aacc8 Author: Uoti Urpala Date: Thu Dec 31 08:08:50 2009 +0200 demux_mkv: remove useless code Remove leftover code that no longer did anything useful after earlier changes. libmpdemux/demux_mkv.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) commit edcc0c9674e8e3442076d4e783b030cb0366fd59 Author: Uoti Urpala Date: Thu Dec 31 07:05:11 2009 +0200 demux_mkv: respect -forceidx Don't use the index included in the file if the -forceidx option was specified. libmpdemux/demux_mkv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c97d19eb4978419807cce096a878c4c0cf55b0bb Author: reimar Date: Wed Dec 30 20:50:03 2009 +0000 Add a hack for broken youtube servers not returning Accept-Ranges. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30145 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit e25e6ec309e08cbf022adbf6027b259fbe5487db Author: compn Date: Wed Dec 30 19:37:19 2009 +0000 add tm2x / tm2a binary decoder git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30144 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit 3daa4e73cc243b430447761c6642bfb4f37979aa Author: reimar Date: Wed Dec 30 19:30:06 2009 +0000 Make the ffmpeg decoders for DTS and AC3 the default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30143 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) commit 22c0b2ed5700946c258b84dd59f584e6a8220468 Author: reimar Date: Wed Dec 30 12:06:09 2009 +0000 Support 440P in scale filter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30142 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 1eb19f0a16850d1552ea368ae905ab8b7f354ab6 Author: reimar Date: Wed Dec 30 12:03:53 2009 +0000 FFmpeg JPEG codecs can output 440p format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30141 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit cc46a64a26bc351a440ac615ac65cec864dba845 Author: reimar Date: Wed Dec 30 12:03:17 2009 +0000 Add support for 440p colorspace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30140 b3059339-0415-0410-9bf9-f77b7e298cf2 codec-cfg.c | 1 + fmt-conversion.c | 2 ++ libmpcodecs/img_format.c | 4 ++++ libmpcodecs/img_format.h | 1 + libmpcodecs/mp_image.h | 1 + m_option.c | 1 + 6 files changed, 10 insertions(+), 0 deletions(-) commit 8e35068138e7e6398c03b6b38a69be9aaef426c7 Author: reimar Date: Wed Dec 30 11:32:24 2009 +0000 Support all planar YUV formats in OpenGL vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30139 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 17 +++++++++--- libvo/gl_common.h | 2 + libvo/vo_gl.c | 76 ++++++++++++++++++++++++++++++++-------------------- libvo/vo_gl2.c | 60 ++++++++++++++++++++++++----------------- 4 files changed, 97 insertions(+), 58 deletions(-) commit 92f20f876f7efac016d9b69aa01fe3d2f0fc6f68 Author: reimar Date: Wed Dec 30 11:08:44 2009 +0000 Add a helper function to get the chroma scale shift and use to simplify mpi setup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30138 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/img_format.c | 37 +++++++++++++++++++++++++++++++++++++ libmpcodecs/img_format.h | 7 +++++++ libmpcodecs/mp_image.h | 39 ++++++--------------------------------- 3 files changed, 50 insertions(+), 33 deletions(-) commit d46b86bc7c39082b26ec71aa16431f3275d836ff Merge: a06b32b 3e8f281 Author: Uoti Urpala Date: Wed Dec 30 00:53:08 2009 +0200 Merge svn changes up to r30136 Ignore another broken correct-pts change in 30134. commit a06b32b64e91082c11f747e2910f10a4afd3dfa9 Merge: dc7f183 a3e355b Author: Uoti Urpala Date: Wed Dec 30 00:18:58 2009 +0200 Merge svn changes up to r30108 (with "-s ours") Skip more inferior external-libass support changes from svn. commit 427039acff27c8d9b605d9b807d6f3a2c15830aa Author: gpoirier Date: Tue Dec 29 22:16:28 2009 +0000 sync w/r30135 (up to date at last!) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30137 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/fr/mplayer.1 | 133 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 97 insertions(+), 36 deletions(-) commit dc7f1830224e1953fb07ffcc045735b2b15af310 Merge: 0f81e5f a0601ed Author: Uoti Urpala Date: Wed Dec 30 00:14:20 2009 +0200 Merge svn changes up to r30104 Ignore the broken correct-pts change in r30100. commit 0f81e5f9732d143ab47c9b03dfd528f3a0af4aea Merge: 67b40bd bfd01bd Author: Uoti Urpala Date: Tue Dec 29 23:59:08 2009 +0200 Merge svn changes up to r30068 (skip libass changes) Mark inferior external libass support implementation from svn merged with "-s ours" (no actual changes to the tree). This tree already contains a better implementation. commit 67b40bd21988fed2f70b1c4f5aea301b28f78298 Merge: 9fe4f64 f97fd3e Author: Uoti Urpala Date: Tue Dec 29 23:57:14 2009 +0200 Merge svn changes up to r30065 commit 9fe4f647824b8067ea4e4f6cf7f699e6c8fa67cb Author: Uoti Urpala Date: Tue Dec 29 21:06:21 2009 +0200 demux_mkv.c, ebml.c: Reformat to K&R style libmpdemux/demux_mkv.c | 4269 +++++++++++++++++++++++------------------------- libmpdemux/ebml.c | 400 +++--- 2 files changed, 2228 insertions(+), 2441 deletions(-) commit 3e8f2815c19703f5cb6f75db2910234d499d9676 Author: diego Date: Tue Dec 29 18:09:07 2009 +0000 cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30136 b3059339-0415-0410-9bf9-f77b7e298cf2 vobsub.c | 1754 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 853 insertions(+), 901 deletions(-) commit c447ef4e746fe4952f547b5f21e21cb3f052caa5 Author: Uoti Urpala Date: Tue Dec 29 16:37:27 2009 +0200 ao_alsa: Reinitialize parameters properly when reopening ao_alsa used static variables to define the parameter values for snd_pcm_hw_params_set_buffer_time_near() and snd_pcm_hw_params_set_periods_near(). The variables were non-const and the desired value was only set in the initializer. The ALSA functions in question take a pointer argument to an in/out parameter which is modified to reflect the value actually used. As a result, when playing multiple files or otherwise reinitializing the AO the later instances could use values that had been modified by earlier calls. Change the code to always always use the same default values. libao2/ao_alsa.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 57ce95b96a9d5ff75b5afa608bdda8366a999cf5 Author: Uoti Urpala Date: Tue Dec 29 15:51:59 2009 +0200 audio: Remove fixed decode_audio() return size limit (MAX_OUTBURST) A couple of months ago MPlayer's ALSA driver started rounding the amount of input data it was willing to accept in one call down to an integer multiple of the value it set in ao_data.outburst. In some configurations it was possible for this value to exceed the 64 KiB limit on the amount MPlayer was willing to write in a single call to the AO. As a result ao_alsa accepted 0 bytes in each play() call and audio playback failed. Fix this by removing the fixed 64 KiB limit on the amount of audio sent to AO at once; the limit was mostly a remnant of older code anyway. configure | 3 -- libao2/ao_oss.c | 2 - libmpcodecs/dec_audio.c | 6 ++- mencoder.c | 1 - mplayer.c | 89 +++++++++++++++++++++------------------------- 5 files changed, 45 insertions(+), 56 deletions(-) commit d47cd2aa67ecd4bbab2b72719623cbfa71af5dc9 Author: compn Date: Tue Dec 29 13:43:03 2009 +0000 change bandwidth value to bandwidth bytes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30135 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d7d8babe61914f14df1fc1bab173574e1fabad1e Author: Uoti Urpala Date: Mon Dec 28 22:01:00 2009 +0200 cosmetics: Revert old dec_audio.c code uglification Revert 3 old code uglification changes that were done with the excuse of gcc-2.95 support. The last reverted change was a fix to a bug introduced in the middle change. Revert "10l, len may change after initialization time" This reverts commit ae9db277c7dae6350cab22d9c57d78cc4684aa9c. Revert "fix declaration after statement, take 2" This reverts commit 4bceedee9305e1ebf53c598eb863aac4153e67d5. Revert "fix declaration after statement" This reverts commit aef0374c1cef269d65b8783dae8d33ee45a1f976. libmpcodecs/dec_audio.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) commit ed4dbd3cbd82919026f4fabd84e847bd03cfeae4 Author: cehoyos Date: Mon Dec 28 13:49:08 2009 +0000 Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30134 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit d79daa2736212c602445a02e45ab8acbaca3eccd Author: cehoyos Date: Mon Dec 28 13:39:26 2009 +0000 Revert r30100: It breaks some mov and asf samples. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30133 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit f20cd805ec6ab0ab505242b8e55a1164b4735591 Author: diego Date: Mon Dec 28 12:05:20 2009 +0000 Remove unused variable, fixes the warning: libswscale/swscale_template.c:2575: warning: unused variable ‘srcFormat’ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30132 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 0c6287921fd460aed0042e7b6a3d3d46f291bd7e Author: compn Date: Sun Dec 27 20:57:03 2009 +0000 add lavc yuv rawcodecs to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30131 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) commit ca2af2d0e78eb3457ff84b829d7ce683d7278876 Author: reimar Date: Sun Dec 27 15:28:01 2009 +0000 Add support for parsing audio streams (though should be easy to extend to video) via libavcodec. Parsing can be done at the demuxer stage (currently disabled) or at the decoder (ad_ffmpeg, enabled). Should allow using the libavcodec AAC, DTS, ... decoders independent of container format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_ffmpeg.c | 15 +++++- libmpdemux/aviheader.c | 1 + libmpdemux/demux_mpg.c | 1 + libmpdemux/demux_ts.c | 1 + libmpdemux/demuxer.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++- libmpdemux/demuxer.h | 1 + libmpdemux/stheader.h | 4 ++ 7 files changed, 156 insertions(+), 3 deletions(-) commit bcda7b2f9990b56dfc12d31e95b8d507202df82c Author: reimar Date: Sun Dec 27 14:42:37 2009 +0000 Remove currently unneeded members accidentally added in the last revision. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30129 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/stheader.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 52dab179cb12f8e8870d9aab97183ca4bcd118e7 Author: reimar Date: Sun Dec 27 14:40:56 2009 +0000 Introduce a sh_common struct that contains the parts in common by the audio, video and sub "stream headers". One reason for this is to help avoid/make more obvious things like members with the same function but different name (extradata vs. codecdata etc.), or members with the same name but different semantics (pts for audio vs. pts for video). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30128 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/stheader.h | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) commit 4fbcbaacbcc935c5f4497573e6fc59b29f0640e5 Author: reimar Date: Sun Dec 27 14:35:09 2009 +0000 Remove one more incorrect direct ass.h include. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30127 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_mkv.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 51e55db62ed6f3e9a22ae4e5e1c99522933fd15d Author: reimar Date: Sun Dec 27 14:31:13 2009 +0000 Move do_render_osd function to avoid a forward declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30126 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 62 +++++++++++++++++++++++++++----------------------------- 1 files changed, 30 insertions(+), 32 deletions(-) commit a5ee26b559959f3049677fd47f4c3619f0c57fd6 Author: reimar Date: Sun Dec 27 14:19:48 2009 +0000 vo_x11_classhint name argument should be const, since we pass string constants there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30125 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/x11_common.c | 2 +- libvo/x11_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 467013ecdc98ad80d50f425af1e41efc63a37f1f Author: reimar Date: Sun Dec 27 14:13:06 2009 +0000 Return the actually playing audio/video id for get_property, not the one selected e.g. via commandline (which resulted in -1 being returned most of the time). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30124 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) commit 96a73a2d7d71e139bd5e74bec8837b44f18f30a5 Author: kostya Date: Sun Dec 27 14:09:38 2009 +0000 lavc Interplay Video decoder now supports 16-bit mode too git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30123 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit eac140b748d1bdef15b9c182d341a0a66a92cbd1 Author: reimar Date: Sun Dec 27 14:07:29 2009 +0000 Subtitle are now also available without video, so remove that check from the subtitle property handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30122 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 97ed05be95e1ba30b21d61bcd5d5ae533d280b6c Author: reimar Date: Sun Dec 27 14:06:47 2009 +0000 Use the same condition to decide if the audio/video id property is not available for all commands (get, set and print). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30121 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) commit ea54d1771f9c15daf4afa25da15b92d77ae9dfba Author: reimar Date: Sun Dec 27 14:02:20 2009 +0000 When setting audio or video track make sure we will not try to dereference a NULL pointer, e.g. because there is no video stream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30120 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 683844573727783b273fd51bd19b82b16363ac62 Author: reimar Date: Sun Dec 27 13:56:51 2009 +0000 Print a ANS_ERROR reply if one of the *_property slave command fails. Based on patch by Adrian Stutz [adrian sttz ch]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30119 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) commit 3241bdffd6ca7f17a49ca3c2df4737e747e56ea8 Author: reimar Date: Sat Dec 26 12:07:14 2009 +0000 Set some freed pointers to NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30118 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 487ddca70c65de5bfa1f79d725659ff807c22daa Author: reimar Date: Sat Dec 26 12:04:48 2009 +0000 Free playtree_iter upon exiting MPlayer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30117 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit afc5a627d85cec556e7fca13fc5a03e5c4452850 Author: reimar Date: Sat Dec 26 11:51:19 2009 +0000 Support mp_image with allocated palette. Fixes playback and a memory leak for FFmpeg codecs which use reget_buffer with paletted data, e.g. cdgraphics. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30116 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/mp_image.h | 4 +++- libmpcodecs/vd_ffmpeg.c | 10 ++++++---- libmpcodecs/vf.c | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) commit bd06a94738d902bbac42c4573ba8640463423b8e Author: reimar Date: Sat Dec 26 11:33:45 2009 +0000 Remove only use if MP_IMGFLAG_RGB_PALETTE to allow giving the flag a slightly different meaning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30115 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_vfw.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 929a159f6941207d18dfeb73c2adb95edc5b54c3 Author: reimar Date: Sat Dec 26 11:11:41 2009 +0000 Restore the old value of planes[1] in vf_palette at the end to ensure we do not call free() on the fixed gray_pal array. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30114 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_palette.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 48b88b30e037f9d4292a9d0d44559e0622c42504 Author: jrash Date: Sat Dec 26 02:35:36 2009 +0000 sync with en/mplayer.1 r30075 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30113 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) commit e0423842de2aeb4a1275785c2de1cfc332af1a72 Author: reimar Date: Fri Dec 25 09:03:02 2009 +0000 Fix grammar/missing verb in description. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30112 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/extension.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 57963ac45dcbe0bdc4c5367a0b87157e03e7552a Author: reimar Date: Fri Dec 25 08:55:36 2009 +0000 Remove unnecessary entries from extension_table, these formats are already in the lavf preferred_list, and thus will be handled by lavf immediately. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30111 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/extension.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit d7549acc01b570061aaf04bd81dfc44bb8918895 Author: reimar Date: Fri Dec 25 08:48:57 2009 +0000 Add a (unfortunately rather long) explanation on how and when to use it to the file extension -> demuxer mapping list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30110 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/extension.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit c0aeb1c1c7d8e1ce75fdfe819d4ef0956c4058f2 Author: compn Date: Thu Dec 24 18:20:03 2009 +0000 force cdg to lavf demuxer in extensions.c, misdetected as mpeg otherwise git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30109 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/extension.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit a3e355babf48e2c86652883cdb20e8fee5529276 Author: reimar Date: Thu Dec 24 10:56:25 2009 +0000 Revert renaming of process_force_style to restore compilation against Ubuntu's libass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30108 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 6 +++--- libass/ass.h | 2 -- libass/ass_mp.c | 2 +- libass/ass_mp.h | 3 +++ 4 files changed, 7 insertions(+), 6 deletions(-) commit 6023874828599e37e14056e5fc10325adfdba50c Author: reimar Date: Thu Dec 24 10:51:24 2009 +0000 Some ugly hacks to make compiling against a newer external version of libass work. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.c | 7 ++++--- libass/ass_mp.h | 9 +++++++++ libmpcodecs/vf_ass.c | 4 ++++ libmpcodecs/vf_vo.c | 4 ++++ libvo/video_out.h | 1 + libvo/vo_gl.c | 1 + libvo/vo_vdpau.c | 1 + mpcommon.h | 3 ++- 8 files changed, 26 insertions(+), 4 deletions(-) commit 1414f844c565a5c0170bb7250eafbd84ffdb93c6 Author: reimar Date: Thu Dec 24 10:45:05 2009 +0000 rename process_force_style to ass_process_force_style to match the API as newer libass versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30106 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass.c | 6 +++--- libass/ass.h | 2 ++ libass/ass_mp.c | 4 +--- 3 files changed, 6 insertions(+), 6 deletions(-) commit 2908957147cd336e16da6bbe28c461abbb2df38f Author: reimar Date: Thu Dec 24 10:26:29 2009 +0000 Remove more direct includes of libass/ass.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2 gui/cfg.c | 1 - gui/interface.c | 1 - libmpcodecs/vf_ass.c | 1 - libmpcodecs/vf_vo.c | 1 - libvo/vo_gl.c | 1 - libvo/vo_vdpau.c | 1 - mencoder.c | 1 - mplayer.c | 1 - 8 files changed, 0 insertions(+), 8 deletions(-) commit a0601ed2566d132fec57dcf163372f9f341f3c13 Author: compn Date: Thu Dec 24 04:36:04 2009 +0000 create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30104 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ libmpdemux/mp_taglists.c | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) commit ec09523d0f2fdfe6d410e8666d032113903b0d21 Author: Kovenksy Date: Wed Dec 23 15:30:38 2009 -0300 Remove vo_matrixview Was broken by 2bcfe1e and was nothing but eyecandy anyway. libvo/matrixview.c | 445 ---------------------------------------- libvo/matrixview.h | 8 - libvo/matrixview_textures.c | 479 ------------------------------------------- libvo/video_out.c | 1 - libvo/vo_matrixview.c | 450 ---------------------------------------- 5 files changed, 0 insertions(+), 1383 deletions(-) commit 0a0129aa801837455ec36e37bca614ab70dba1bc Author: Kovenksy Date: Wed Dec 23 15:09:59 2009 -0300 100l: fix PKG_CONFIG_PATH mangling Python != Perl build/script/mplayer-config | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 96c573c4591296d7127c575a741d3c79e0c9b2b7 Merge: d9e0e90 8ee23f4 Author: Kovenksy Date: Wed Dec 23 15:09:38 2009 -0300 Update sources Conflicts: libvo/font_load_ft.c mplayer.c commit 8eaf81f67672d10fe7186901b1a0271796755f69 Author: kostya Date: Wed Dec 23 16:11:48 2009 +0000 Register lavc Aura 2 decoder git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30103 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 7055e3cd054ce9dc8a5f96f651f53536ec5f8a2c Author: kostya Date: Wed Dec 23 13:44:23 2009 +0000 Register lavc Aura decoder git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30102 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit dfe6cfd9670f520d6f09d124667fac0e22ae9761 Author: diego Date: Wed Dec 23 10:21:53 2009 +0000 Allow passing variants of "mingw32" as system name to --target. This ensures backwards compatibility after switching from "mingw32msvc" to "mingw32". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30101 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 468d5f2e0a408ec794219d9bcbef2b330ac5c155 Author: cehoyos Date: Tue Dec 22 20:56:59 2009 +0000 Do not use correct-pts by default for demuxer lavf, it breaks all PAFF files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30100 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 34fb57ce561c74df1f15ef8938fbd4c752fa9ebc Author: ramiro Date: Mon Dec 21 01:59:34 2009 +0000 Remove parameters no longer used in h[yc]scale(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30099 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) commit 767326f4842fbb4bc05beea5bc25072e98a57c8c Author: ramiro Date: Mon Dec 21 01:54:59 2009 +0000 Move fast bilinear scaler code to the existing h[yc]scale_fast() functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30098 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 4 +- libswscale/swscale_template.c | 388 ++++++++++++++++++++-------------------- 2 files changed, 196 insertions(+), 196 deletions(-) commit 0ebdb661a6ebc99315ca8a65ae6b3e670907162e Author: ramiro Date: Mon Dec 21 01:41:29 2009 +0000 Rename function pointers used to convert from the input pixel format to the intermediate YV12 to a more descriptive name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30097 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 14 +++--- libswscale/swscale_template.c | 96 ++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 55 deletions(-) commit 342009a438caf531ba6d5ecd67ececf04910f8c4 Author: ramiro Date: Mon Dec 21 01:34:45 2009 +0000 Check if chroma horizontal scaler is needed in sws_init_swScale(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30096 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 2 ++ libswscale/swscale_template.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) commit 779c4a0df59fa842868f92a1e076fb87e25fcf5f Author: ramiro Date: Mon Dec 21 01:30:55 2009 +0000 Remove unused fields from SwsContext. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30095 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 61f34a81016600fdcf2e7191e1e8345e5d83d465 Author: diego Date: Sun Dec 20 21:11:39 2009 +0000 Do not auto-generate the C code to handle PCI vendor and device names. This part of the code does not change so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30094 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- vidix/pci_db2c.awk | 54 ++++++++------------------------------------------- vidix/pci_names.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 46 deletions(-) commit 7810431c0279fe59b1aaa7922389e0cc7bbd917a Author: gpoirier Date: Sun Dec 20 20:57:44 2009 +0000 sync w/r29731 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30093 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/fr/mplayer.1 | 54 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 44 insertions(+), 10 deletions(-) commit d9ea2f0d0e38488ad166eed05af5bfbd46faadab Author: diego Date: Sun Dec 20 19:56:18 2009 +0000 Remove unused debugging output about total number of printed lines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30092 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit db1d7210dbe2ebbde37c8efe82b98690937bf051 Author: diego Date: Sun Dec 20 19:36:30 2009 +0000 Employ slightly better variable names for output files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30091 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 96 ++++++++++++++++++++++++++-------------------------- 1 files changed, 48 insertions(+), 48 deletions(-) commit 3a4525bfc2310ca90e0aa6c72e325b3bffe79b70 Author: diego Date: Sun Dec 20 19:32:25 2009 +0000 Eliminate completely pointless print_includes function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30090 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) commit 4e18fed06427e5e386a0291e8741e7462b792a5c Author: diego Date: Sun Dec 20 19:12:20 2009 +0000 Use "mingw32" instead of "mingw32msvc" as system name for MinGW with --target. The former is the official name used by the MinGW project. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30089 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 48ed8799acb00009b73e6044a6305bf66ec6a780 Author: diego Date: Sun Dec 20 17:49:07 2009 +0000 Do not autogenerate vidix/pci_names.h. Its contents is always the same, so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30088 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- vidix/pci_db2c.awk | 21 --------------------- vidix/pci_names.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 22 deletions(-) commit 032a7778277dda380f6bea1e3d7e1b1aa7f15807 Author: ramiro Date: Sun Dec 20 17:42:35 2009 +0000 Indentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30087 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 12 ++++++------ libswscale/swscale_internal.h | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) commit b8d5738c09e8ad2039d8c3ef34b2fea913038ec1 Author: ramiro Date: Sun Dec 20 17:15:01 2009 +0000 Indent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30086 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit c082aa34adef2d8148ce601a8142b3ce036fc522 Author: ramiro Date: Sun Dec 20 17:09:46 2009 +0000 Set fast_bilinear functions in sws_init_swScale(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30085 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) commit b252972ab468cbe3a9d7ff33366561c40d0391ec Author: diego Date: Sun Dec 20 17:09:20 2009 +0000 Remove pointless return statements from functions that return nothing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30084 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit 7046f2cd1666418771f2af8693a4b2952379cf0e Author: diego Date: Sun Dec 20 17:01:47 2009 +0000 Move code to write multiple inclusion guards to generated files into functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30083 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) commit 2d4a819ef505973aa2ad58b37af65c7b11e7e6ae Author: ramiro Date: Sun Dec 20 16:32:58 2009 +0000 Set horizontal scaler's range conversion in context in sws_init_swScale(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30082 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 3 ++ libswscale/swscale_template.c | 75 +++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 28 deletions(-) commit 08f9e35211ec53e2ff44844e2a84459079e88779 Author: ramiro Date: Sun Dec 20 16:21:25 2009 +0000 Set horizontal scaler's src offsets in context in sws_init_swScale(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30081 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_internal.h | 4 ++++ libswscale/swscale_template.c | 39 ++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 19 deletions(-) commit 884849df53cecf93115d094b95aa01fc2b76b558 Author: diego Date: Sun Dec 20 15:16:34 2009 +0000 cosmetics: Use more consistent formatting style for generated files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30080 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 65 +++++++++++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 36 deletions(-) commit cccb6f6d7eed61be3e86c5f81cdc630453f92d30 Author: diego Date: Sun Dec 20 14:43:50 2009 +0000 cosmetics: Use a consistent formattting style; tabs to spaces. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30079 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 399 +++++++++++++++++++++++++-------------------------- 1 files changed, 196 insertions(+), 203 deletions(-) commit acd1630d1b212f7589fa67e1fc4bfc0c5053682c Author: reimar Date: Sun Dec 20 14:32:34 2009 +0000 Change %f to %e in generated fragment programs to avoid losing precision unnecessarily. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30078 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) commit c3da36a9acd6836524f80fb8ca1851218001b7c2 Author: diego Date: Sun Dec 20 14:14:56 2009 +0000 Run vidix/pci_db2c.awk directly instead of passing it to awk. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30077 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit af52185c9326a864d7b7a12005398a01d5d4e4a3 Author: cehoyos Date: Sun Dec 20 13:25:08 2009 +0000 VP6F has to be flipped for binary decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30076 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) commit 81783bceed260a17ccd353038327d168109c2a25 Author: reimar Date: Sat Dec 19 21:08:14 2009 +0000 Slightly improve vo_gl suboption documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30075 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 13 ++++++++++--- libvo/vo_gl.c | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) commit 763402d423c74007417f8e2514f8cb900cc7ddc6 Author: reimar Date: Sat Dec 19 21:07:42 2009 +0000 Define GL_GENERATE_MIPMAP ourselves if necessary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30074 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 8b6dca72c6e0fa481bb2889ce5f765c438396549 Author: reimar Date: Sat Dec 19 20:59:58 2009 +0000 Fix compilation with internal ASS when no ass header is installed system-wide. Patch by Erik Auerswald [auerswal unix-ag.uni-kl.de] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30073 b3059339-0415-0410-9bf9-f77b7e298cf2 libass/ass_mp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 300d40bed3c9e3b443c18c5c7ef95d067c690d2e Author: reimar Date: Sat Dec 19 20:53:34 2009 +0000 Add support for auto-generating mipmaps in vo_gl, should ease implementing anything that needs blur filters with large support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30072 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) commit 5dc258f4e8d31ba0989a811be0d82511026938d3 Author: reimar Date: Sat Dec 19 20:48:23 2009 +0000 Make -vo gl:customprog also work with RGB input (obviously those need to be special RGB fragment programs). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30071 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) commit 89a2a84868c32613ab81886956e15a5e23c85209 Author: reimar Date: Sat Dec 19 20:45:34 2009 +0000 Fix a broken indentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30070 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 213707b9e4efb2c1c524b1541fe3e8843576438a Author: reimar Date: Sat Dec 19 20:44:55 2009 +0000 Enable running fragment programs with YUV_CONVERSION_NONE git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30069 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit bfd01bdc1700bac53392dc827f3f7870124d0406 Author: reimar Date: Sat Dec 19 15:41:47 2009 +0000 Make ass_mp.h use the system-libass headers when the internal one is disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30068 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 6 ++++++ libass/ass_mp.h | 5 ++++- 2 files changed, 10 insertions(+), 1 deletions(-) commit 4ab63df7af7ceac58d3cb6a3068cb16b4e3ff6ee Author: reimar Date: Sat Dec 19 15:32:17 2009 +0000 Never include ass.h and ass_types.h directly, use ass_mp.h instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30067 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 1 - libmpdemux/demuxer.h | 2 +- mpcommon.c | 1 - 3 files changed, 1 insertions(+), 3 deletions(-) commit 1f4109d85e5a788817321f44c45fa763bce5ffed Author: reimar Date: Sat Dec 19 15:18:22 2009 +0000 Experimental support for external libass. So far probably only works with the libass from Ubuntu 9.10 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 2 ++ Makefile | 7 ++++--- configure | 10 +++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) commit f97fd3eff02bd1048750f350230d9e9192ea3dfd Author: reimar Date: Sat Dec 19 13:49:44 2009 +0000 Rename GL_* defines to CONFIG_GL_* git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 8 ++++---- libvo/gl_common.c | 12 ++++++------ libvo/gl_common.h | 12 ++++++------ libvo/vo_gl.c | 12 ++++++------ libvo/vo_gl2.c | 18 +++++++++--------- 5 files changed, 31 insertions(+), 31 deletions(-) commit 0aac4fa9dce9c24d5697e741a0fe58177eeb9df1 Author: reimar Date: Sat Dec 19 13:46:34 2009 +0000 Add x11_common as dependency for OpenGL with X11 backend. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30064 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 140de2a9e2a7a057ff58254eb3d0eafe0754ae24 Author: reimar Date: Sat Dec 19 10:52:32 2009 +0000 Make the check for X11 and WIN32 backends for OpenGL separate. This fixes compilation on Windows with X11 but no GLX available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 15 +++++++++++++-- libvo/gl_common.c | 6 +++--- libvo/gl_common.h | 6 +++--- libvo/vo_gl.c | 8 ++++---- libvo/vo_gl2.c | 2 +- 5 files changed, 24 insertions(+), 13 deletions(-) commit cb7a098c81c2cd2191faa452d9f025da7a22e1bc Author: reimar Date: Fri Dec 18 20:27:35 2009 +0000 Add a missing const, fixes a compiler warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30062 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_pulse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b7fa147ee8020c0124f82353a2386877305bcb1f Author: reimar Date: Fri Dec 18 20:26:28 2009 +0000 Allow pulseaudio to restore the previous volume on init instead of forcing to full volume. The old behaviour can be restored by using -volume 100. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30061 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_pulse.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) commit e858d98f4f6980cb07cae6166d3f85ba86a46963 Author: reimar Date: Fri Dec 18 20:22:39 2009 +0000 Get rid of global volume variable, it is only used for temporary values. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30060 b3059339-0415-0410-9bf9-f77b7e298cf2 libao2/ao_pulse.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit 2ed18d7a2a08519f5ac7121c68289d0d4dd17e78 Author: reimar Date: Fri Dec 18 19:29:33 2009 +0000 Use on-stack subtitle struct for temporary storage for passing subtitles on for rendering by libass. This avoids mangling the static subtitle struct that is supposed to contain the subtitles that will actually be displayed and it also minimally reduces memory usage by freeing the subtitle lines again as early as possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30059 b3059339-0415-0410-9bf9-f77b7e298cf2 mpcommon.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) commit 8ee23f418f1e8ea0310f01d4b48c73a693056d87 Author: Uoti Urpala Date: Fri Dec 18 19:18:19 2009 +0200 subtitles: Fix double text with libass rendered plaintext subs When using libass to render plaintext (non-SSA/ASS) subtitles the code in update_subtitles() still called set_osd_subtitle() in one case, causing the global vo_sub variable containing non-libass subtitles to be set. Under some circumstances this resulted in both a libass-rendered and non-libass-rendered version of the same subtitle appearing on screen. Fix by running the subtitle clearing code (which called set_osd_subtitle) only when libass is not used. mpcommon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit efcc9ad7120e01a17fc3659cb0229135b1cebb95 Merge: 1598302 8fcbe58 Author: Uoti Urpala Date: Fri Dec 18 18:54:42 2009 +0200 Merge svn changes up to r30055 commit 332bb06e4fd5f1458097090b89efd669dbe790bf Author: ptt Date: Fri Dec 18 15:57:52 2009 +0000 synced to r30044 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30058 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-it.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit ce45b671b57346e1e3208424e07d64afcb374494 Author: ptt Date: Fri Dec 18 15:57:22 2009 +0000 divided a line in two, was too long git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30057 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 5f8ae5d0db95bf872d8f1c75ab252afc8f42a7b8 Author: ptt Date: Fri Dec 18 15:55:45 2009 +0000 synced with r30043 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30056 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit 8fcbe5835d038649e70da410d46c4f5cd502c261 Author: jrash Date: Fri Dec 18 11:31:58 2009 +0000 Synced with help_mp-en.h r30044 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30055 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-zh_CN.h | 92 +++++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 46 deletions(-) commit c911be40734a8c6bd9609f40f915e4dc764ff0b3 Author: jrash Date: Fri Dec 18 11:15:09 2009 +0000 sync with en/mplayer.1 r30053 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30054 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 54fc3a69e7e11d2dd27e1d9277fd182ad8ebe3fd Author: cehoyos Date: Thu Dec 17 20:15:34 2009 +0000 Support R210 uncompressed 10 bit RGB codec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30053 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit baaee832fdf16db01d49cc87ee028467f48fca7f Author: reimar Date: Thu Dec 17 18:31:59 2009 +0000 Do not modify priv->idx_pos when regenerating the index, use a local variable instead. should fix seeking after starting playback with -force-idx broken by r29914. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30052 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/aviheader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit e3b42e3e96a5983538e970ef11ed9748e2cf2aa7 Author: cehoyos Date: Thu Dec 17 13:27:15 2009 +0000 Cosmetics: Reindent after r30050. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30051 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 3303bb67eca5b7609a36082ce862b1beb4920d42 Author: cehoyos Date: Thu Dec 17 13:23:15 2009 +0000 Slightly increase hardware decoding performance by always using more video surfaces than absolutely necessary. I will revert if somebody reports real-world resource issues introduced by this commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30050 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) commit d8fed1f04c621a48f3294d3df5c6ed47867bd328 Author: adrian Date: Thu Dec 17 10:57:40 2009 +0000 Cosmetics: reindent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30049 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/font_load_ft.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) commit 9182f6a97cf894fa57a266fa15aa2d21cbfceb22 Author: cehoyos Date: Thu Dec 17 02:16:12 2009 +0000 Improve VDPAU render performance by increasing number of output surfaces. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30048 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c796878e402cf56cd500d0657ec359863fe16bf3 Author: diego Date: Wed Dec 16 23:44:26 2009 +0000 Make vidix/pci_db2c.awk executable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30047 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/pci_db2c.awk | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit 1078baf9aa35ea06428671f17bce93d438b0cb75 Author: adrian Date: Wed Dec 16 22:36:17 2009 +0000 The fontconfig check added in r30044 wasn't safe. This makes it more robust. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30046 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/font_load_ft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d018006adc10bff9ec4fdc7a63a997aef628d251 Author: diego Date: Wed Dec 16 11:59:53 2009 +0000 Simplify the evaluation of the lang-def template: Use the language variable directly in the template instead of passing the language variable as a parameter to $(call). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30045 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) commit 067b81750004a883209ae9936b1e9c4b31ab3b1a Author: adrian Date: Wed Dec 16 11:11:31 2009 +0000 Fix a crash when fontconfig is unable to select a font. e.g. if no config directory could be found. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30044 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-en.h | 1 + libvo/font_load_ft.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) commit 2a33cd01f6d969600a56e9ea28d1504be7e7eafd Author: adrian Date: Tue Dec 15 20:38:54 2009 +0000 Add support for -geometry to corevideo. Based on a patch by Tim Wojtulewicz (timwoj at ieee dot org). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30043 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- libvo/vo_corevideo.m | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) commit 5f0b5dcaa96326512835afbae46c30aeaa164b13 Author: adrian Date: Tue Dec 15 20:25:50 2009 +0000 Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30042 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 4 ++-- libvo/vo_corevideo.m | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) commit 1598302be65c77c107330dc46fd0dabface3112d Author: Uoti Urpala Date: Tue Dec 15 15:27:30 2009 +0200 Fix printf format strings with invalid '%lf' conversion Some code used an invalid '%lf' conversion specification for double arguments. Maybe they were written that way due to confusion with scanf where doubles are indicated by '%lf'; however it is not a valid printf format specifier. Change those cases to use '%f'. command.c | 4 ++-- libao2/ao_sgi.c | 2 +- libmpdemux/demux_mpg.c | 2 +- libmpdemux/muxer_mpeg.c | 32 ++++++++++++++++---------------- mplayer.c | 2 +- stream/tvi_v4l.c | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) commit 8448c911533acaf60aeb3d2780c32c015d13f0c4 Author: compn Date: Tue Dec 15 02:13:51 2009 +0000 add spdif example from beandog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30041 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/example.conf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 69171f86e27b2e4c4498600a1f0887d165c20b1b Author: diego Date: Mon Dec 14 12:03:02 2009 +0000 Filter list of missing source files so that it only contains nonexisting files. Thus those files can be symlinked directly without testing if they exist. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30040 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 1745f18511c9022f1fe9b9cc930d651e3eae09df Author: diego Date: Mon Dec 14 11:54:49 2009 +0000 Add missing #includes to fix a bunch of 'implicit declaration of..' warnings. patch by Peter Hjalmarsson, xake rymdraket net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30039 b3059339-0415-0410-9bf9-f77b7e298cf2 tremor/misc.h | 2 ++ tremor/tremor.diff | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) commit 316cd982df6a9dea88727c91cb966273320483a9 Author: diego Date: Mon Dec 14 04:06:25 2009 +0000 Use $(notdir ) to filter out path prefixes instead of reinventing it poorly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30038 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0f4aed64d1ffab14b5f0532458c83e58a551369f Author: diego Date: Mon Dec 14 03:50:34 2009 +0000 Avoid hackish shell loop to symlink missing XML source files. Instead, employ make syntax to generate the shell command arguments. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30037 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 49b5defb6effe0ee6c9d331c1b5c3a6d09ffc3d4 Author: diego Date: Mon Dec 14 03:43:54 2009 +0000 Globally remove main.xml from SYMLINKS_DEPS. It should never be symlinked. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30036 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 3ea762f28f378900d17cdf2afb0ee52bdaa164cf Author: diego Date: Mon Dec 14 03:35:26 2009 +0000 Reuse SYMLINKS_DEPS variable in the symlink targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30035 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 05f35acd589b11ce3165d697dfcfe43d01d23b36 Author: diego Date: Mon Dec 14 03:32:12 2009 +0000 Simplify shell command to symlink missing translated source files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30034 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit f39814302d390978c310a52d2543a91de83f20aa Author: diego Date: Mon Dec 14 03:19:01 2009 +0000 Ignore errors from failing rm commands in clean targets. This is also the policy we have in the top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30033 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit ac50f582483fa367eecf81285ae722018287f19d Author: diego Date: Mon Dec 14 03:17:23 2009 +0000 Do not ignore errors from mkdir invocations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30032 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 35a7136f5c9f5acef3581f1ff1cc9fa17267aeed Author: diego Date: Mon Dec 14 03:14:21 2009 +0000 The general xmllint target should only check configured languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30031 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 055694d3cdb5e529d6626deddc02709cfe411f71 Author: diego Date: Mon Dec 14 03:09:09 2009 +0000 Improve declaration of phony targets. This prevents configure from being rerun all the time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30030 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 1586e9212d0795948eec2d463046623ba8a30d94 Author: diego Date: Mon Dec 14 03:07:35 2009 +0000 Factorize dependencies of language-specific HTML generation targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30029 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 9e41ccd3bc38b99efe3c105a9ca9f495937c4d4e Author: diego Date: Mon Dec 14 03:01:40 2009 +0000 spelling cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30028 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 6fe2e9b0acb580b2cda8d5d6b17a8abd00a363b6 Author: diego Date: Mon Dec 14 02:59:39 2009 +0000 Remove pointless dependency on xmllint.sh from phony xmllint target. The individual language targets carry that dependency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30027 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0ba35473ebe5f6a1b25c3e63c0c56eda989e23d7 Author: diego Date: Mon Dec 14 02:45:55 2009 +0000 Drop pointless dependencies of the phony targets html-chunked and html-single. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30026 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 7cc9d58f73c0090a88c132728f72afb5584b56a2 Author: diego Date: Mon Dec 14 02:42:59 2009 +0000 Fix dependencies of html-chunked and html-single targets. All the files generated by configure are required. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30025 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 8bc89968cf5ac6a0be5078fdd981486abfdd2063 Author: diego Date: Mon Dec 14 02:40:55 2009 +0000 Exploit one more opportunity to make use of the CONFIGURE_GENERATED variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30024 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit bd1e209f88bcada8ec245488f964c18c31d37106 Author: diego Date: Mon Dec 14 02:39:22 2009 +0000 Factorize all components generated by configure into a variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30023 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 318f59cc4d037521d1002baeb71a06e89b77b485 Author: diego Date: Mon Dec 14 02:34:41 2009 +0000 Remove outdated comment about build system behavior. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30022 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/README.maintainers | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 24d9de2ce495266fa2c8c16c657d5567506cbd9c Author: diego Date: Mon Dec 14 02:25:40 2009 +0000 cosmetics: Rename XSL_DEPS variable to SINGLE_XSL_DEPS for consistency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30021 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 62197a7183ee35f97ed31d78f4c2794673828a0e Author: diego Date: Mon Dec 14 02:01:50 2009 +0000 Drop support for per-language XSL stylesheets. The feature was never properly used and provides little benefit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30020 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 14 ------------- DOCS/xml/README.maintainers | 45 +----------------------------------------- 2 files changed, 2 insertions(+), 57 deletions(-) commit 0886fd008923d8f881091ab5bb2d173418e18fdb Author: diego Date: Mon Dec 14 02:00:25 2009 +0000 Remove pointless Polish stylesheet; it provides no real benefit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30019 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/pl/html-chunk.xsl | 8 -------- DOCS/xml/pl/html-common.xsl | 15 --------------- DOCS/xml/pl/html-single.xsl | 8 -------- 3 files changed, 0 insertions(+), 31 deletions(-) commit a1c5ce61194e5bb12eb9e61076c241104ecc0e71 Author: diego Date: Mon Dec 14 01:51:42 2009 +0000 Drop support for per-language stylesheets. In all these years nobody ever used this feature. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30018 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 5 +---- DOCS/xml/README.maintainers | 6 +----- DOCS/xml/cs/Makefile | 3 --- DOCS/xml/de/Makefile | 3 --- DOCS/xml/en/Makefile | 3 --- DOCS/xml/es/Makefile | 3 --- DOCS/xml/fr/Makefile | 3 --- DOCS/xml/hu/Makefile | 3 --- DOCS/xml/it/Makefile | 3 --- DOCS/xml/pl/Makefile | 3 --- DOCS/xml/ru/Makefile | 3 --- DOCS/xml/zh_CN/Makefile | 3 --- 12 files changed, 2 insertions(+), 39 deletions(-) commit 130e2f9b675dcc40f26743fb5bf068e75392532b Author: diego Date: Mon Dec 14 01:34:02 2009 +0000 Unconditionally symlink documentation files missing from a translation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30017 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 3 +-- DOCS/xml/README.maintainers | 5 ----- DOCS/xml/cs/Makefile | 3 --- DOCS/xml/de/Makefile | 3 --- DOCS/xml/en/Makefile | 3 --- DOCS/xml/es/Makefile | 3 --- DOCS/xml/fr/Makefile | 3 --- DOCS/xml/hu/Makefile | 3 --- DOCS/xml/it/Makefile | 3 --- DOCS/xml/pl/Makefile | 3 --- DOCS/xml/ru/Makefile | 3 --- DOCS/xml/zh_CN/Makefile | 3 --- 12 files changed, 1 insertions(+), 37 deletions(-) commit 1f52f6765264b9ae3dff5d8ddd23bacfd8c714b6 Author: diego Date: Mon Dec 14 00:57:33 2009 +0000 Use variable for HTML stylesheet so individual languages can use their own. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30016 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 18c69ef7808d069c10a49deb0f01afe9b503903d Author: diego Date: Mon Dec 14 00:42:46 2009 +0000 Factorize stylesheet installation into its own target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30015 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) commit b933c31df5e85b89e1610e91c933e587434c299e Author: diego Date: Mon Dec 14 00:16:32 2009 +0000 Construct monolithic targets with the HTMLDIR instead of the HTMLFILE variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30014 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- DOCS/xml/Makefile.inc | 4 ++-- DOCS/xml/cs/Makefile | 3 +-- DOCS/xml/de/Makefile | 3 +-- DOCS/xml/en/Makefile | 3 +-- DOCS/xml/es/Makefile | 3 +-- DOCS/xml/fr/Makefile | 3 +-- DOCS/xml/hu/Makefile | 3 +-- DOCS/xml/it/Makefile | 3 +-- DOCS/xml/pl/Makefile | 3 +-- DOCS/xml/ru/Makefile | 3 +-- DOCS/xml/zh_CN/Makefile | 3 +-- 12 files changed, 13 insertions(+), 23 deletions(-) commit 4a7eee53920f0a6c77d8e95dcb5318219e8e98fc Author: diego Date: Sun Dec 13 23:59:10 2009 +0000 Factorize generating the list of all main.xml files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30013 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 82624ac049656817805be1d05a9b61761fa70594 Author: diego Date: Sun Dec 13 23:54:46 2009 +0000 configure also generates all main.xml files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30012 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5ffe3cf4797e7ad4dcf422474f3ac315f4d5a782 Author: diego Date: Sun Dec 13 23:50:38 2009 +0000 Add html-chunk.xsl and html-single.xsl to targets generated by configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30011 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 01ebb2b49a65e051e0065f3fcdfd190921f95e14 Author: diego Date: Sun Dec 13 23:48:20 2009 +0000 Avoid '&>' bashism for redirecting both stdout and stderr. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30010 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d1cab97233109562807ee0a7ccf44be7401432fb Author: diego Date: Sun Dec 13 23:22:55 2009 +0000 Simplify one more command via automatic variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30009 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 79e3b42c2a12b3e57076101566e06540ebe6a6d6 Author: diego Date: Sun Dec 13 23:17:11 2009 +0000 Simplify setting COMMON_XSL_DEPS variable: Use $(wildcard ) directly instead of using it to control a conditional. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30008 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) commit b72afc004c0bb745d05f38224660444615e5d15d Author: diego Date: Sun Dec 13 22:51:55 2009 +0000 Do not build monolithic documentation in a separate directory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30007 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/README | 6 +++--- DOCS/xml/Makefile | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) commit 7952f2315e64f7f84dded372d6779d4fc88cdd8c Author: diego Date: Sun Dec 13 22:43:37 2009 +0000 - Remove now unnecessary dependency on intermediate directories. - Update README.maintainers to reflect that the monolithic documentation is no longer built in a separate dir (accidentally committed part that belongs to the next committed revision). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30006 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 4 ++-- DOCS/xml/README.maintainers | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 4e093071806d831a559faa4b6d865da90a5b905b Author: diego Date: Sun Dec 13 22:25:08 2009 +0000 Do not pointlessly set the HTMLFILE variable when running xmllint. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30005 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a1b76a2914349ad99abf60cb29a74bde2e972e18 Author: diego Date: Sun Dec 13 22:23:34 2009 +0000 Simplify some commands via automatic variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30004 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 985b7e57ae8616b9aa9c5ff4d1e5469e55a10541 Author: diego Date: Sun Dec 13 22:15:50 2009 +0000 Create required directories directly without intermediate steps. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30003 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) commit 05de890bad0299894d7804894228c3de40d46166 Author: diego Date: Sun Dec 13 22:10:39 2009 +0000 Declare common dependencies for chunked and single HTML targets together. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30002 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 8c42f1b7bcab35e3d70a0d6bea0865c67d5393dc Author: diego Date: Sun Dec 13 21:51:09 2009 +0000 cosmetics: Remove pointless trailing /. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30001 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 11dc4089e74d4373fde9687c079574914f405ff5 Author: diego Date: Sun Dec 13 21:43:31 2009 +0000 xmllint.sh is not a phony target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30000 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 464d2e597f433110c8e0502528a2d48cc137d166 Author: diego Date: Sun Dec 13 21:33:24 2009 +0000 Do not use symlinks for translations that comprise all XML files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29999 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/de/Makefile | 2 +- DOCS/xml/hu/Makefile | 2 +- DOCS/xml/ru/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 24b378c00ca658da69af0d8b7b9185833e53abf7 Author: diego Date: Sun Dec 13 21:24:04 2009 +0000 Remove pointless warning about Make being called from the wrong place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29998 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) commit a3c7601ce8fe772c901e42ce29e638a62522fa3f Author: compn Date: Sun Dec 13 19:21:38 2009 +0000 add MTSJ fourcc to ffmjpeg and ldead mjpeg codec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29997 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit ca65466a05ad6f608b092b9b75e14854b34d6b9a Author: diego Date: Sun Dec 13 12:41:17 2009 +0000 Replace shell command substitution by Makefile syntax construct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29996 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit dcd42d9779857631dfa891453c847ba6e68ba647 Author: diego Date: Sun Dec 13 12:38:16 2009 +0000 Use automatic variables instead of the target name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29995 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit e50d429186ce2b27d25f3385ea230e1bc696922c Author: diego Date: Sun Dec 13 12:31:26 2009 +0000 Do not pointlessly remove all targets before recreating them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29994 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 5ef58f03513d97c518a330d5d97f508529a3235e Author: diego Date: Sun Dec 13 12:28:42 2009 +0000 Declare a dependency on xmllint instead of duplicating the target's commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29993 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/Makefile.inc | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit 8e77ab12b812106f929f349bf4ceb495989bb23b Author: Uoti Urpala Date: Sun Dec 13 00:19:41 2009 +0200 -identify output: use ordered chapters length for ID_LENGTH Print the overall timeline length as ID_LENGTH instead of the length of the main file. This may help external GUIs handle ordered chapters somewhat better. mplayer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit a5ceff924f07b9c0c6b192f90cc4f2487a7e9b36 Author: reimar Date: Fri Dec 11 22:27:42 2009 +0000 Avoid miscompilation issues with the grow_array function more permanently by marking it noinline. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29992 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_mkv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e58e467c5650433efc8974e781ca029357f33122 Author: reimar Date: Fri Dec 11 21:33:57 2009 +0000 100l, fix check for V4L2 capture capability flag. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29991 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/tvi_v4l2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9aa17fbbb6a07bfa3cea5def4785f2db807e4581 Author: cehoyos Date: Thu Dec 10 23:22:19 2009 +0000 Update the SuperH VEU vidix driver with experimental support for VEU3F. Patch by Magnus Damm, damm opensource se git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29990 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/sh_veu_vid.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) commit 2a0af1ad5d194b45293cce06fc55d93aa26d545e Author: cehoyos Date: Thu Dec 10 23:20:09 2009 +0000 Fix build on SuperH. Patch by Magnus Damm, damm opensource se git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29989 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/AsmMacros.h | 2 -- vidix/sysdep/pci_linux.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) commit e17256978730314b79b851a9f80275065d7b5ca0 Author: cehoyos Date: Thu Dec 10 23:16:08 2009 +0000 Update the SuperH VEU vidix driver with code that calls fsync() after each frame to make sure the frame is flushed in case of deferred io. Patch by Magnus Damm, damm opensource se git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29988 b3059339-0415-0410-9bf9-f77b7e298cf2 vidix/sh_veu_vid.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) commit de3620319a1ea2f711da09e4d8f3e20f229361bb Author: compn Date: Wed Dec 9 20:20:18 2009 +0000 vdpau codecs config entry by beandog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29987 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/example.conf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit e0b789ec7bf2a23d6bb640f7635649d9a1c3d98f Author: reimar Date: Wed Dec 9 17:55:34 2009 +0000 Disable winsock when we already found a working socklib instead of checking blindly for cygwin and uselessly running the check on e.g. Linux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29986 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 5c5087081fcc119a5579ebac8e81f76cd3cf4a15 Author: reimar Date: Wed Dec 9 17:52:18 2009 +0000 DShow TV input needs part of the our DirectShow code, so add the proper dependencies to the Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29985 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 80981cd2d0fa1abe1a5f99d15e503a3653929937 Author: reimar Date: Wed Dec 9 17:50:07 2009 +0000 Use a fallback to make sure the basic OpenGL functions are available instead of initializing them which does not work well with reinitializations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29984 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 100 +++++++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 45 deletions(-) commit c13aaf85d16bdcea449823cc56fc6892c8a8b9c4 Author: reimar Date: Wed Dec 9 17:36:55 2009 +0000 Prefer GLAPIENTRY over APIENTRY, it is the better name and used more by OpenGL headers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29983 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 138 +++++++++++++++++++++++++------------------------- libvo/gl_common.h | 146 ++++++++++++++++++++++++++-------------------------- 2 files changed, 142 insertions(+), 142 deletions(-) commit 3b1e70e3ee7dd2a1960eec918fb6cfb3e0624143 Author: cehoyos Date: Tue Dec 8 23:58:42 2009 +0000 Support FourCC's AVI1 and AVI2 as MJPEG. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29982 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit e64d47925a7100a8a986251265180b1f1a1a8c9c Author: reimar Date: Tue Dec 8 23:32:51 2009 +0000 Pass all OpenGL functions through a function pointer indirection. This still needs more work, but should allow supporting e.g. GLX-OpenGL and Win32-OpenGL with a single binary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29981 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 204 +++++++++++++++++++++++++++++++++++++--------------- libvo/gl_common.h | 41 +++++++++++ libvo/vo_gl.c | 130 +++++++++++++++++----------------- 3 files changed, 251 insertions(+), 124 deletions(-) commit 2661039adac72207ee510fc98927a7cdac018254 Author: reimar Date: Tue Dec 8 06:42:46 2009 +0000 Very preliminary code to allow selecting the OpenGL backend at runtime. Works in the currently supported cases for only Win32 and only X11, the mixed case is not working yet though. But applied anyway since the code is slightly less messy than the current one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29980 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++----- libvo/gl_common.h | 52 +++++++++++++++++++++++------------ libvo/vo_gl.c | 41 +++++++++++++--------------- libvo/vo_gl2.c | 55 +++++++++++++++++++----------------- 4 files changed, 153 insertions(+), 73 deletions(-) commit 1057181fd7ef1684ddaefbb081b9e90cb6eee348 Author: reimar Date: Mon Dec 7 23:11:40 2009 +0000 Add braces to avoid ambiguous else. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29979 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit b5b701c544338af167932a0cd803e3a11d1ab0d7 Author: ramiro Date: Mon Dec 7 03:52:55 2009 +0000 Document the differences between the two asm fragments in initMMX2HScaler(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29978 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit 15f812898fa32db55681376df3fea759519167b9 Author: Uoti Urpala Date: Mon Dec 7 01:51:37 2009 +0200 vf: Fix filter enabling logic for vf_uspp and vfs using lavc internals Move vf_uspp from the list of filters depending on internal non-API FFmpeg code to the list of filters only depending on libavcodec normally - at least it doesn't need any internal headers, and I don't see other obvious unsafe non-API usage either. Change a leftover CONFIG_LIBAVCODEC_A test to the now correct CONFIG_LIBAVCODEC_INTERNALS to actually allow using the video filters requiring non-API libavcodec internals when --ffmpeg-source-dir was specified. libmpcodecs/vf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 71f9e96fc7470f5ca692698067898c8ce3d6cfec Author: ramiro Date: Sun Dec 6 22:01:25 2009 +0000 Start using intermediate buffers at index 0. These index variables are incremented before each use, so they should be initialized to -1. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29977 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 63e520efbfd5bea0f6e613cce21467d844ba7179 Author: ramiro Date: Sat Dec 5 09:44:19 2009 +0000 Fix compilation with runtime cpu detection. All functions in swscale_template.c should be declared with the RENAME macro. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29976 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) commit c3c0309eecc1d6b309138fcd40df508235c9395d Author: Daniel Dawson Date: Tue Dec 1 04:28:34 2009 -0800 Support for multiple editions in Matroska Add code to intelligently choose an appropriate Matroska edition when there are several. Will choose, in descending order of preference: the edition chosen by the user through the option "-edition " if it exists, the first edition with EditionFlagDefault set to 1 if there is one, or the first edition. DOCS/man/en/mplayer.1 | 6 +++ cfg-common-opts.h | 1 + defaultopts.c | 1 + libmpdemux/demux_mkv.c | 92 ++++++++++++++++++++++++++++++++++-------------- libmpdemux/ebml.h | 1 + options.h | 1 + 6 files changed, 75 insertions(+), 27 deletions(-) commit 9b81b7827ce4ce887c6f22332e31b058f68cf3ac Author: Daniel Dawson Date: Tue Dec 1 03:59:38 2009 -0800 demux_mkv: Detect and warn about virtual timeline nesting Detect use of ChapterSegmentEditionUID element in a Matroska chapter definition, indicating inclusion of an external virtual timeline, which is not yet supported. Leave the chapter is the chapter list but set segment_uid to zero. This way timeline parsing will skip the chapter and avoid nonsensical output but will still print information about missing content. libmpdemux/demux_mkv.c | 16 ++++++++++++++++ libmpdemux/ebml.h | 2 ++ 2 files changed, 18 insertions(+), 0 deletions(-) commit c145024193f869a660826edabe3fb49287fda9aa Author: compn Date: Thu Dec 3 21:04:53 2009 +0000 fix apple.com trailer example, via carl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29975 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/example.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit bf29785d5a617072a72deb43579d4017dffe8e4d Author: ramiro Date: Thu Dec 3 18:18:13 2009 +0000 Add support for nv12/nv21 input. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29974 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 2 + libswscale/swscale_template.c | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) commit 55f94a1a91bf9bf28b5b33f698c28a86c08e0e75 Author: Uoti Urpala Date: Wed Dec 2 17:57:47 2009 +0200 subtitles: Fix recent filter-rendered libass timing problem commit 4c552b2e420ba4cb6d888b12360c7bf63e7cd03a ("core: Do OSD/subtitle updates at a more accurate point") made filter-rendered libass subtitles appear one frame too late the first time they became visible (VO rendering was not affected, and filter rendering was accurate if seeking back later). The reason was that the subtitle code did not feed the subtitle events to libass before their starting time, and this now happened after the filtering phase. Fix this by skipping the time check in the libass case and feeding demuxed subtitles to it unconditionally (as timing is done separately anyway with libass). There are still at least theoretically possible new problems in the filter-rendered case because the filter now relies on packets demuxed before the _previous_ frame. There's a bigger chance of getting the subtitle packet too late, and the filter can't see packets for the first frame after a seek. However the former is not an issue for the samples I tested even with -nosound, and subtitles are not in general guaranteed to be shown when seeking to a new position (though it could be worth a later improvement). mpcommon.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 9afcdab6944587aaee7db0307f3087b5a275771d Author: Uoti Urpala Date: Wed Dec 2 17:36:59 2009 +0200 options: Move ass_enabled to options struct ass_mp.c | 1 - ass_mp.h | 1 - cfg-common-opts.h | 4 ++-- command.c | 11 ++++++----- libmpdemux/demuxer.c | 2 +- mpcommon.c | 2 +- mplayer.c | 11 ++++++----- options.h | 1 + 8 files changed, 17 insertions(+), 16 deletions(-) commit 6da77386e99a511c36df4fde03489bab7f0d1b07 Author: Uoti Urpala Date: Wed Dec 2 13:43:05 2009 +0200 core: Fix timeline state at start of playback A timeline starting in the middle of a source file resulted in initial playback state not being set up properly. Fix this by forcing an absolute seek to initialize timeline state before playback starts. mplayer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 4ef079f279df11038337cff510e9e801a11317bb Author: Uoti Urpala Date: Wed Dec 2 13:01:36 2009 +0200 mplayer.c: Remove unneeded blit_frame arguments The video updating functions no longer need to separately track whether a frame is available for flipping. That information is now available in video_out->frame_loaded, and all the separate tracking did was present opportunities for things to go out of sync. mplayer.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) commit 7044965988cb6aa63f2e493c80050ae39aab5bf8 Author: Uoti Urpala Date: Wed Dec 2 12:50:56 2009 +0200 vf_vo: Use vo_seek_reset() instead of vo_control() Change the vo_control(vo, VOCTRL_RESET, NULL) call done when the vf_vo filter is uninited to vo_seek_reset(vo). The latter also sets vo->frame_loaded to false. Remove the vo->config_ok check from vo_seek_reset(). The reset call should be doable even if config failed. libmpcodecs/vf_vo.c | 2 +- libvo/video_out.c | 2 -- mencoder.c | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) commit de11a44bba877d46cfa3b5150cc191453bf97fed Author: Uoti Urpala Date: Wed Dec 2 12:24:19 2009 +0200 core: Fix ordered chapter timeline building memory corruption Two arrays were allocated one element too small, causing writes beyond the allocated area. The bug was triggered when playing a Matroska file with ordered chapters where each chapter came from a different source and none of the sources was the original file. Noticed by Daniel Dawson mplayer.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit 74fd43cf701e1cd17c7a28cf0898a169004b9242 Author: Uoti Urpala Date: Wed Dec 2 03:45:54 2009 +0200 demux_mkv.c: Make time arithmetic more precise in one more case Use rounding instead of truncation in another case of double division used with integer variables. libmpdemux/demux_mkv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cb8ae3fe63a2d58cf29d23dfb733781563186b08 Author: compn Date: Tue Dec 1 05:02:26 2009 +0000 add slif fourcc (modified mpeg2 codec) to ffmpeg sw decoders git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29973 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 9c846b3df6ff206f59364b2d5ae511c293d8e44a Author: lorenm Date: Sun Nov 29 05:18:40 2009 +0000 sync to x264-r1327. (only needed for x264-in-libavcodec) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29972 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ed333bb31dd62030f62c534277f144e7da318194 Merge: 5017d71 b2adf9d Author: Uoti Urpala Date: Sun Nov 29 06:11:02 2009 +0200 Merge svn changes up to r29971 commit 5017d713b1765048cf97d9ef73518ece826e9306 Author: Uoti Urpala Date: Sun Nov 29 05:34:59 2009 +0200 vo_gl: Remove incorrect glXSwapIntervalEXT use The list of OpenGL extension function names to try for setting the swapinterval value contained "glXSwapIntervalEXT". Such a function exists in the extension GL_EXT_swap_control but takes different arguments than vo_gl expects, so trying to use it from the current code would lead to unpredictable behavior. Remove it from the list of functions to use. libvo/gl_common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit dbd1ab182ecf794fa576ffbda49e666f2e3b8bae Author: Uoti Urpala Date: Sun Nov 29 01:32:30 2009 +0200 vo_vdpau.c: Fix compilation with old libvdpau versions Misplaced #endif broke compilation with old libvdpau versions that lack VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 #define. Also add missing space to the text in related mp_msg() call. libvo/vo_vdpau.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b2adf9d98d8f59162ffcfdcd254e8626aacbec18 Author: tack Date: Sat Nov 28 18:23:26 2009 +0000 Fix mangling of 24-bit audio during channel reorder. Only 1/3 of the samples in the buffer passed to reorder_channel_nch() were being reordered. For 8-, 16-, and 32-bit audio, the buffers could be treated as int8_t, int16_t, and int32_t respectively. 24-bit audio was being processed as int8_t, requiring iteration over n_samples*3, not n_samples. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29971 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/reorder_ch.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) commit ea6fe5dc405c6f5f5bfbcd6db2e4504ca67f2795 Author: attila Date: Sat Nov 28 18:01:54 2009 +0000 when using -v, print also which lavc codec has been used, not just that the init was ok git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29970 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_ffmpeg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d37f69a09c743998976f72e6298ea19fccf9d6dd Author: jrash Date: Fri Nov 27 12:23:06 2009 +0000 improve previous translation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29969 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-zh_CN.h | 82 +++++++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 41 deletions(-) commit 5b7ed8dad51f0cf884fca9e04f1ea8bdedefebb1 Author: stefano Date: Thu Nov 26 21:08:45 2009 +0000 Make sws_format_name() use av_pix_fmt_descriptors. This also introduces a dependency of libswscale on libavutil. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29968 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 113 ++------------------------------------------------ libswscale/swscale.h | 2 +- 2 files changed, 5 insertions(+), 110 deletions(-) commit d75ab2c3b512884b0179a18e8abff0bcdcda56ad Author: compn Date: Thu Nov 26 18:01:13 2009 +0000 add user-agent example to fix apple.com/trailers git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29967 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/example.conf | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit cf2227159a4ae5bfd753c26b8bec5b60c9bccdf7 Author: compn Date: Thu Nov 26 18:00:45 2009 +0000 map 0x20736D to ffac3, fixes broken mov sample git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29966 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit b3eaf99833739a685e9ccd4baa47c70244ca31fa Author: compn Date: Thu Nov 26 17:57:33 2009 +0000 mime type [video/x-ms-wmv] is not an ASF redirector. patch by KO Myung-Hun komh!chollian!net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29965 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/asf_streaming.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit d9e0e9035a45e2ab4d6842f110c1b8c523e96d5c Merge: 5b76d6e 1dba61a Author: Kovenksy Date: Thu Nov 26 17:06:49 2009 +0000 Merge changes with uau Also changed the style of the version header to match uau's version script. Conflicts: version.sh commit 731e9490b2455df986fff1acda65d70b490d2bc8 Author: reimar Date: Tue Nov 24 06:59:21 2009 +0000 Readjust the global number of subs when switching dvdnav track to take into account any change in the number of DVD subtitles available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29964 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit f6c6ca342297898ebc5cfae898340282baa44359 Author: compn Date: Mon Nov 23 20:41:06 2009 +0000 small update wishlist git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29963 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/wishlist | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 1dba61a67063fac2c6f02dc31ab84e61ff279617 Author: Uoti Urpala Date: Mon Nov 23 05:40:52 2009 +0200 build: Generate version numbers for git Update the version.sh script for git so it'll generate version numbers more useful than "UNKNOWN". At the moment it only generates the short SHA1 name, but adding a tag as a starting point should allow more useful output. Rather than update the Makefile logic that tried to guess whether the svn revision had changed since the last version.h update, just run the version.sh script from configure so the version is updated at least at that time. Makefile | 4 ---- configure | 2 ++ version.sh | 12 +++++------- 3 files changed, 7 insertions(+), 11 deletions(-) commit d3a1fa98f4e20ce707a7da54d381adf1e3d1eb87 Author: Uoti Urpala Date: Mon Nov 23 04:38:32 2009 +0200 core: Fix rare corner cases in video frame generation Check that frames added by filters reach the screen and are not just buffered by the VO, and give filters a chance to output added frames if previous frame at EOF was buffered by VO. It's unlikely that anyone ever noticed practical problems caused by these issues. mplayer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit e43926d6d1bf243eec90bc790b453e402be2eb8c Author: Uoti Urpala Date: Mon Nov 23 04:31:15 2009 +0200 core: Handle VO-added frames even with correct-pts disabled At least show the extra frames even if correct-pts mode is disabled. They cannot be timed properly though; the most practical way to fix that is to just move to correct-pts mode instead. mplayer.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) commit 34c8b502e9b0b23e9719c9f41bedee9e9c314a29 Author: Uoti Urpala Date: Mon Nov 23 03:41:29 2009 +0200 stream_ffmpeg: Fix reads near EOF stream_ffmpeg used libavformat's url_read_complete() to read data. However that function returns failure if it did not manage to read the _full_ amount of data asked for, while the behavior we want is to return any positive amount of data there was before end of file. This caused attempts to read the last bytes in a file to fail. Fix by using url_read() instead of url_read_complete(); even if some reads before EOF return less than the full amount that should not be a problem. stream/stream_ffmpeg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 5b76d6ef2557d4a1f94e75867b5e738bc807b973 Merge: 483d966 5995bc1 Author: Kovenksy Date: Sun Nov 22 21:35:24 2009 -0300 Update sources Conflicts: libvo/w32_common.c commit 5995bc175aea0417ce7ff7285c1c8fc84ebb5704 Merge: 4c552b2 af2988c Author: Uoti Urpala Date: Mon Nov 23 01:56:21 2009 +0200 Merge svn changes up to r29962 commit af2988cbcef1b057772d44b9f9752be3f15960b0 Author: reimar Date: Sun Nov 22 15:18:21 2009 +0000 Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_audio.c | 2 +- libmpdemux/demux_avi.c | 6 +++--- libmpdemux/demux_lavf.c | 2 +- libmpdemux/muxer_lavf.c | 2 +- stream/http.c | 2 +- stream/stream.c | 8 ++++---- stream/stream.h | 10 +++++----- stream/stream_cue.c | 2 +- stream/stream_dvd.c | 2 +- stream/stream_dvdnav.c | 2 +- stream/stream_file.c | 2 +- stream/stream_netstream.c | 2 +- stream/stream_smb.c | 2 +- subreader.c | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) commit 302527a111cc88cc0bdd16d74d161eea9577da18 Author: reimar Date: Sun Nov 22 15:10:50 2009 +0000 Some MinGW awk versions can not handle reading from files with CRLF line-ending, so force this file to always use just LF git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29961 b3059339-0415-0410-9bf9-f77b7e298cf2 commit b379d40d90daf53a73363e930483bf571c41d068 Author: reimar Date: Sun Nov 22 14:46:43 2009 +0000 100l, forgot to apply vo_w32_get_dc/vo_w32_release_dc declarations in w32_common.h Should fix compilation on MinGW. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29960 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/w32_common.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 897f210bf4606cff88c49e658b0b2a97dcd7b5f7 Author: reimar Date: Sun Nov 22 14:15:41 2009 +0000 av_alloc_format_context -> avformat_alloc_context git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29959 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b01af7a4286cc52d04e486b31bdd3a5b49af8ebd Author: reimar Date: Sun Nov 22 13:26:57 2009 +0000 Fix initialization values for vf_expand priv struct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29958 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_expand.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 86e0273c140544fc474ed923c54f31a440c7f1d1 Author: reimar Date: Sun Nov 22 13:25:07 2009 +0000 Remove unused variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29957 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_delogo.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 2959f9e0327b12e14537c5211f71e087e29d2ff2 Author: reimar Date: Sun Nov 22 13:18:12 2009 +0000 Add const to draw_slice argument to match what FFmpeg expects for draw_horiz_band. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29956 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit dcd0dacccaa18af16e33d03d51062bef5eade67f Author: reimar Date: Sun Nov 22 13:14:39 2009 +0000 Switch ad_ffmpeg to avcodec_decode_audio3 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29955 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_ffmpeg.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 65c2bae2b542a5157481ea8ca037da0583d85d50 Author: reimar Date: Sun Nov 22 13:08:43 2009 +0000 Remove unused variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29954 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_ffmpeg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 054d1889ef28527b0f4bc8a6449b870cb0524212 Author: reimar Date: Sun Nov 22 13:06:44 2009 +0000 Reuse buffer in priv context instead of allocating the 32kB probe buffer on the stack. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29953 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) commit 4c552b2e420ba4cb6d888b12360c7bf63e7cd03a Author: Uoti Urpala Date: Sun Nov 22 14:15:12 2009 +0200 core: Do OSD/subtitle updates at a more accurate point OSD contents such as video position and non-libass subtitles were updated just before feeding a video frame through filters. The updates were done at that point mainly for the benefit of vf_expand OSD rendering functionality, which draws the OSD contents when the frame passes through that filter. However this gave the wrong results for VO-drawn OSD if the filter chain or VO had any delay or timestamp manipulation: the OSD contents should reflect the most recent contents that were _output_ after any filtering, not the last frame that was fed _into_ the filtering machinery. This issue became more important after vo_vdpau started buffering frames by default. Move the OSD updates to be done just before the OSD is drawn, using the most accurate available information. This fixes the common case but worsens vf_expand OSD behavior (adding extra latency). A special case could be added to fall back to the previous behavior when vf_expand OSD is being used; however I don't consider that a high priority at the moment especially when other problems with vf_expand OSD would still remain. This has little effect on libass-rendered subtitles either way, because both vf_ass and VO libass rendering use timestamps from the filter chain and do not rely on separate position updates. mplayer.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) commit ac8e40b4ff9318c1d607f7158131e091897d07e7 Author: Uoti Urpala Date: Sun Nov 22 12:41:04 2009 +0200 af_scaletempo: Fix delay value after changing scale to 1 The scaletempo filter has a special-case check to return the samples unchanged if the current scaling factor is 1. In this case code setting af->delay wasn't run. If the scale had had a different value and then been changed to 1 as a result of a playback speed change then the delay field could have a nonzero value left, resulting in A/V sync errors. Fix by setting the delay field to 0 in the scale == 1 special case code. libaf/af_scaletempo.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 4d55629cd6337598fb58fbf58b3fbe6e3f9d4850 Author: reimar Date: Sun Nov 22 00:22:24 2009 +0000 Fix crash with partial fribidi conversion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29952 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 75c4d3e8b5acce44b91d0a08b2e3856a843243e8 Author: reimar Date: Sun Nov 22 00:10:52 2009 +0000 Mention right-to-left support for embedded subtitles also in the Changelog. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29951 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 03e99c5cb89a1965273da2feb3908de07b6803d4 Author: reimar Date: Sun Nov 22 00:09:40 2009 +0000 Make fribidi (i.e. right-to-left) support work with embedded subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29950 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) commit 4a89d764516f013f380f90e2c8a1c2d142295dbe Author: jrash Date: Sat Nov 21 23:47:19 2009 +0000 Synced with help_mp-en.h r29912 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29949 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-zh_CN.h | 427 +++++++++++++++++++++++++------------------------- 1 files changed, 214 insertions(+), 213 deletions(-) commit 1bd34477aaa25af20bda40adb056540b1e48f671 Author: reimar Date: Sat Nov 21 22:32:53 2009 +0000 Print which visual glXChooseVisual chose when running in verbose mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29948 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_gl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit c045f6525f77146f73ae3565ac035a87b0c60453 Author: reimar Date: Sat Nov 21 22:30:33 2009 +0000 Move OpenGL-related messages that have large output from MSGL_V to MSGL_DGB2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29947 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 4805ea9864ed18b123637d9aafa4f090d950d329 Author: reimar Date: Sat Nov 21 22:27:40 2009 +0000 Add support for Windows OpenGL rendering onto a device instead of into a window. Has little use except for experimenting - on Windows 9x it could be used to render on monitors that were not managed by Windows, but that feature was removed in newer Windows versions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29946 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 8 ++++---- libvo/vo_gl2.c | 4 ++-- libvo/w32_common.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 8 deletions(-) commit 4198e9d45b98c7657cbddfdb74f5647e0e6c21de Author: reimar Date: Sat Nov 21 19:50:33 2009 +0000 Remove unreachable parsing code: for filters that use the option parser, the args argument to open will always be NULL and vf->priv will always be != NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29945 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_crop.c | 13 ------------- libmpcodecs/vf_delogo.c | 14 -------------- libmpcodecs/vf_eq.c | 6 ------ libmpcodecs/vf_format.c | 39 --------------------------------------- libmpcodecs/vf_hue.c | 5 ----- libmpcodecs/vf_noformat.c | 39 --------------------------------------- libmpcodecs/vf_scale.c | 19 ------------------- 7 files changed, 0 insertions(+), 135 deletions(-) commit 597c92ff7fc51392562b4985a145b2682b5758c7 Author: reimar Date: Sat Nov 21 18:59:52 2009 +0000 Support RGB48NE format in OpenGL vos (only really useful once they are modified to actually use GLX/WGL visuals with more than 8 bits per component if available). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29944 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 6fa77ca503a5fa4b4a47c232a9459bc4a931c110 Author: reimar Date: Sat Nov 21 18:58:03 2009 +0000 Allow vf_scale to output to RGB48, though still prefer the 24 and 32 bit formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29943 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vf_scale.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 74b7dcc5f4d9be7293b78fced5ce888bb94c08dc Author: Uoti Urpala Date: Sat Nov 21 20:53:10 2009 +0200 core: Add support for decoder reordering of pts values Add a mode where libavcodec's reordered_opaque feature is used to associate container packet timestamps with decoded frames. This should improve behavior at least for MPEG files with interlaced h264; the previous code does not cope well with the libavformat demuxer producing two field packets with separate timestamps but the libavcodec h264 decoder only producing a single output frame for those two packets (so half the timestamps have no associated output frame). The current libavformat mpeg demuxer seems to finally work with interlaced h264 files and produce valid timestamps which are useful with a mode like this. By default MPlayer now selects between this new mode and the old one automatically based on the number of timestamp problems they cause; by default the new mode is used if both seem to work. The new option -pts-association-mode can be used to force a particular mode. If correct-pts mode is disabled this has no effect on timing. Also remove the "EXPERIMENTAL" marker from the manpage description of -correct-pts. DOCS/man/en/mplayer.1 | 19 +++++++++++++++++-- cfg-mplayer.h | 1 + libmpcodecs/dec_video.c | 29 ++++++++++++++++++++++++++--- libmpcodecs/vd.h | 2 ++ libmpcodecs/vd_ffmpeg.c | 30 ++++++++++++++++++++++++++---- libmpdemux/stheader.h | 7 +++++++ mplayer.c | 31 +++++++++++++++++++++++++++++++ options.h | 1 + 8 files changed, 111 insertions(+), 9 deletions(-) commit 1f93734fd8478b62a4b1524d1c65348eae2063b8 Author: reimar Date: Sat Nov 21 18:47:47 2009 +0000 Support 16-bit-per-component RGB formats (rgb48[bln]e) in option parser. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29942 b3059339-0415-0410-9bf9-f77b7e298cf2 m_option.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 8a6fdd634d620356ab51a4ecb1590217ad4f23f6 Author: reimar Date: Sat Nov 21 18:45:41 2009 +0000 Add a define for IMGFMT_RGB48NE that depends on machine endianness. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29941 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/img_format.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit d1a2c821988ec51afdd405d7d5099f4c799d81c3 Author: reimar Date: Fri Nov 20 23:48:16 2009 +0000 Move 128kB buffer from stack to demuxer context. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29940 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_ty.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 66c41d41c55a144c4cacd0e8f5b586e4a4f53ef1 Author: reimar Date: Fri Nov 20 23:41:06 2009 +0000 calloc instead of malloc+memset. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29939 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_rawdv.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) commit bd5ec5065ebb8f2ff3f1ab3d7bc14097afc93e2d Author: reimar Date: Fri Nov 20 23:36:16 2009 +0000 Use calloc to allocate a rather large (currently 32k) array instead of putting it on the stack, performance should not matter much here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29938 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/gl_common.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 4aff125b35984e7777d06edccdceeb28e531b907 Author: Uoti Urpala Date: Fri Nov 20 23:15:11 2009 +0200 VO: Keep aspect by adding black bars in window mode too if necessary By default (without -nokeepaspect) MPlayer tries to maintain video aspect ratio by using window manager hints to keep output window aspect when resizing. Before this commit it would however scale the video to completely fill the window even if the window manager did not respect those hints. Change the behavior to add black bars like in fullscreen mode instead in this case. DOCS/man/en/mplayer.1 | 8 ++++++-- libvo/video_out.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) commit dc6a72386cf52dd310b5e765cfff595eac2ed596 Author: reimar Date: Fri Nov 20 10:32:45 2009 +0000 sub_fribidi should be static, it is not used outside subreader.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29937 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 752839d86b2ca9d45fdf59a746de1107ee547957 Author: reimar Date: Fri Nov 20 10:24:31 2009 +0000 Use early return instead of block over whole function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29936 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 6712791ad648ab7a6595969421a5d2847a947a29 Author: reimar Date: Fri Nov 20 10:22:57 2009 +0000 Use FFMAX instead of a custom max macro. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29935 b3059339-0415-0410-9bf9-f77b7e298cf2 subreader.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit 483d966c519b0bf30e0e8c5039c515d134589aba Author: Kovenksy Date: Thu Nov 19 15:07:42 2009 -0300 Updated ffmpeg Also disable vaapi by default on ffmpeg, mplayer makes no use of that feature and it only causes linking errors. build/ffmpeg | 2 +- build/ffmpeg-mt | 2 +- build/script/ffmpeg-config | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) commit 6addd212da636ef066a118374fb07c9a1c503f39 Merge: ecbbbac e5bcd70 Author: Kovenksy Date: Thu Nov 19 15:06:15 2009 -0300 Update sources Conflicts: input/input.c libvo/vo_vdpau.c commit c038d74c9bf226d8b48939a0e3a6f542f3928aea Author: cehoyos Date: Wed Nov 18 18:24:05 2009 +0000 Silence two gcc warnings: suggest parentheses around && within || git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29934 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_rtp_codec.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit dd3bf9897d6eb248c938c9d91fbc3f83ef01a504 Author: diego Date: Wed Nov 18 18:07:54 2009 +0000 Add #defines for FFMPEG_LICENSE and FFMPEG_CONFIGURATION to config.h. This is necessary to sync up with some recent FFmpeg changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29933 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 6ef6b3c1e23509e60f0c9f0d76a8248815cd9146 Author: diego Date: Wed Nov 18 17:16:02 2009 +0000 Add functions to return library license and library configuration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29932 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.c | 11 +++++++++++ libswscale/swscale.h | 10 ++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) commit e775bdd70d274834780b02548f2d525f71116f98 Author: cehoyos Date: Wed Nov 18 09:13:09 2009 +0000 10l to Reimar: Fix typo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29931 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_live555.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e5bcd70bc5b0557635ae51c7093f0e887493d4ba Author: Uoti Urpala Date: Tue Nov 17 23:22:10 2009 +0200 vo_vdpau: Check return value when setting video mixer features libvo/vo_vdpau.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit e02a2e7f08a87f2147a149a9a66992965e219fce Author: reimar Date: Tue Nov 17 19:23:55 2009 +0000 Deobfuscate the special hack to disable cache for live555. Cache can not be used for it, since it does not provide any data stream, the data is provided to the demuxer "behind MPlayer's back". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29930 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/cache2.c | 3 +-- stream/stream.h | 4 ++++ stream/stream_live555.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) commit a81e043f98d79f1e0a47210a0f82062e8b5dbcca Author: reimar Date: Tue Nov 17 19:14:42 2009 +0000 Merge malloc+memset -> calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29929 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) commit 450d40d4434de9f886c00b33a8b3059d528d0558 Author: reimar Date: Tue Nov 17 18:30:33 2009 +0000 Fall back to read-based seeking for ffmpeg:// URLs when is_streamed is set (i.e. it is not possible to use url_fseek). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29928 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_ffmpeg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 98ab90d2ca4cb2b3b2e634ba8e08c12930ee236d Author: reimar Date: Tue Nov 17 18:28:43 2009 +0000 Remove useless check for valid fd with -dumpstream, the code does not necessarily need it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29927 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) commit dc19e32d67d04703798755b403fe9e642783e29b Author: reimar Date: Tue Nov 17 18:08:18 2009 +0000 Enable the read-based forward seek fallback also when CONFIG_NETWORK is enabled. Enabling network support should not have side-effects on code not really related to networking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29926 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 00ef6412f47ebe1e841633134982fe2c9f5ff2f1 Author: reimar Date: Tue Nov 17 18:05:54 2009 +0000 Use fill_buffer if available also for STREAMTYPE_STREAM git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29925 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 63ddd1cae57501180f9d1cd2893a882f254a1578 Author: reimar Date: Tue Nov 17 16:13:20 2009 +0000 Mention support for streaming via FFmpeg in Changelog (ffmpeg:// URLs). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29924 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 58301405824924a8e81017c144338d86ca28eba4 Author: reimar Date: Tue Nov 17 16:09:17 2009 +0000 Add preliminary support for streaming via FFmpeg's URProtocol functions. Basic playback tested for file and http protocols. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 4 +- stream/stream.c | 4 ++ stream/stream_ffmpeg.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 1 deletions(-) commit ef1ae8272dac3a004bbb3079c7ece7ea7012d75c Author: reimar Date: Tue Nov 17 16:05:18 2009 +0000 Complete configure support for compiling in FFmpeg's protocol support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29922 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit a98091b77bb193224fff698abc7c41102d7ca7c3 Author: reimar Date: Tue Nov 17 13:56:34 2009 +0000 Use avcodec_align_dimensions to appropriately align width and height in get_buffer instead of reimplementing it badly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29921 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) commit 34279a8ce3c02bb744c635bfa9650494a68a333b Author: Uoti Urpala Date: Tue Nov 17 06:56:29 2009 +0200 cosmetics: remove some unused variables libmpcodecs/ad_ffmpeg.c | 1 - libvo/vo_vdpau.c | 1 - libvo/vo_xv.c | 2 -- libvo/x11_common.c | 3 --- mplayer.c | 1 - 5 files changed, 0 insertions(+), 8 deletions(-) commit 53ecafadc8bddc68f7cddecd6e4675bcdaf4a8fd Author: Uoti Urpala Date: Tue Nov 17 06:18:14 2009 +0200 vo_vdpau: Check return value when setting video attributes Check the return value when setting any video mixer attribute and print an error message if the operation failed. Also simplify code by changing update_csc_matrix() to use the utility function added for this. libvo/vo_vdpau.c | 48 ++++++++++++++++++++++++------------------------ 1 files changed, 24 insertions(+), 24 deletions(-) commit ce77a7ab39853c3f93a6ec4f77307bb2875ae082 Author: Uoti Urpala Date: Tue Nov 17 01:12:12 2009 +0200 vo_xv: Support yuv colorspace changes on ATI cards Use the "XV_COLORSPACE" xv attribute if it exists, in addition to previously supported "XV_ITURBT_709" (which works on NVIDIA cards). libvo/x11_common.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 69e86099e2c1b661580e27d7b06c5db6bb41da0c Author: cehoyos Date: Mon Nov 16 21:38:32 2009 +0000 Set display size in sh_video when decoding H264. This fixes H264 VDPAU decoding with some native demuxers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29920 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/video.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 2cba321003df595a00568cf9b5bfcc7c5fa233b5 Author: cehoyos Date: Mon Nov 16 21:36:27 2009 +0000 Clarify new VDPAU MPEG4 ASP and DVB teletext decoding features. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29919 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 4507c8aa2f4e62896061f1323157b6a4718692ea Author: Gabrov Date: Mon Nov 16 15:20:57 2009 +0000 synced with r29912 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29918 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/hu/mplayer.1 | 127 +++++++++++++++++++++++++++++++++----------- DOCS/xml/hu/bugreports.xml | 2 +- help/help_mp-hu.h | 3 +- 3 files changed, 98 insertions(+), 34 deletions(-) commit ff8b4384d899edb0ddb5839ed7675b736df04cc3 Author: ptt Date: Mon Nov 16 14:26:18 2009 +0000 synced with help_mp-en.h r29912 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29917 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-it.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 04c6f1f979f509bd4e7ac9c9cdd56760146d516c Author: ptt Date: Mon Nov 16 14:22:38 2009 +0000 added -name, -title, -use-filename-title options to Changelog git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29916 b3059339-0415-0410-9bf9-f77b7e298cf2 AUTHORS | 1 + Changelog | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) commit a1af75d83e9bae7dbc8597502d65551d90334ebe Author: Uoti Urpala Date: Mon Nov 16 15:10:35 2009 +0200 mplayer.c: Fix compilation with dvdnav enabled I had forgotten to check dvdnav-specific code after last merge of svn changes. mplayer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 32cc984c714d02301d43cd0ceba49511c09a10fb Author: compn Date: Mon Nov 16 11:15:53 2009 +0000 more changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29915 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) commit 9a2be82856e14a4f3899fb94606123e4b7302c19 Author: reimar Date: Mon Nov 16 10:44:00 2009 +0000 Use calloc instead of initializing each struct member individually to 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29914 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_avi.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) commit 4eac890e07087e0727a14ad8d9671a43b87294cc Author: reimar Date: Mon Nov 16 10:41:06 2009 +0000 Try to detect broken files with unaligned chunks. This patch hopefully makes them playable as long as they have and index without breaking any other files. Fixes http://samples.mplayerhq.hu/avi/invalid_unaligned.avi with native demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29913 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/aviheader.h | 1 + libmpdemux/demux_avi.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) commit 287b62163eed8811b6cd33716c0691d328947d48 Merge: 507f4fe b411278 Author: Uoti Urpala Date: Mon Nov 16 06:54:22 2009 +0200 Merge svn changes up to r29912 commit 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 Merge: 8bbb79c b8861ce Author: Uoti Urpala Date: Mon Nov 16 04:18:13 2009 +0200 Merge branch 'vdpau' commit b8861ce8e28080b151467827f65bdc3707a74511 Author: Uoti Urpala Date: Mon Nov 16 02:45:59 2009 +0200 Support VDPAU MPEG4 hardware decoding Original patch by NVIDIA. DOCS/man/en/mplayer.1 | 3 ++- codec-cfg.c | 1 + etc/codecs.conf | 31 +++++++++++++++++++++++++++++++ fmt-conversion.c | 1 + libmpcodecs/img_format.c | 1 + libmpcodecs/img_format.h | 1 + libvo/vo_vdpau.c | 6 ++++++ 7 files changed, 43 insertions(+), 1 deletions(-) commit 19b4d70e01ca2fd963b4ca599e0377e109a6881f Author: Uoti Urpala Date: Mon Nov 16 00:50:01 2009 +0200 vo_vdpau: Remove custom help message Remove the help text explaining -vo vdpau suboptions that was printed in case of parsing errors. It did perhaps have some value, but there are also reasons to remove it: it was printed in an ugly manner in the middle of output, most other MPlayer options do not have such internal help texts either, and it was detailed enough that it required maintaining documentation about the options in two separate places (the man page and the help message). libvo/vo_vdpau.c | 31 +++++++------------------------ 1 files changed, 7 insertions(+), 24 deletions(-) commit 14bb3416c735e99cbf0507548d3f3fcbba0fba7f Author: Uoti Urpala Date: Sun Nov 15 18:39:48 2009 +0200 vo_vdpau: Add support for high-quality scaling feature Part of the code is currently under #ifdef to allow compilation with older VDPAU library versions; that can be removed later. Partially based on a patch by Carl Eugen Hoyos. DOCS/man/en/mplayer.1 | 7 +++++++ TOOLS/vdpau_functions.py | 1 + libvo/vdpau_template.c | 1 + libvo/vo_vdpau.c | 26 ++++++++++++++++++++++++-- 4 files changed, 33 insertions(+), 2 deletions(-) commit 82ee2e217f8f9ec67bcbd3b6b60f49a003da9300 Author: Uoti Urpala Date: Sun Nov 15 15:50:28 2009 +0200 vo_vdpau: add support for VFCAP_FLIP Patch by Carl Eugen Hoyos. libvo/vo_vdpau.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 7038c57a0c9a037f7f697dbecc656fc2b81f4651 Author: Uoti Urpala Date: Sun Nov 15 15:41:25 2009 +0200 vo_vdpau: Free buffers allocated by FFmpeg on uninit libvo/vo_vdpau.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 98ee8dd15976501157c894ec385c4c551c6614ad Author: Uoti Urpala Date: Sun Nov 15 15:21:40 2009 +0200 Add yuv_colorspace property, implemented in vo_vdpau and vo_xv Add a property to select YUV colorspace. Currently implemented only in vo_vdpau and vo_xv. Allows switching between BT.601, BT.709 and SMPTE-240M (vdpau only). The xv support uses the "XV_ITURBT_709" attribute. At least my NVIDIA card supports that; I don't know whether other xv implementations do. Bind the colorspace switch to the 'c' key by default. 'c' is currently used by vo_sdl for some fullscreen mode change thing, but at the moment that does not conflict and if it will in the future then vo_sdl can change. VDPAU part based on a patch from Lauri Mylläri DOCS/man/en/mplayer.1 | 22 +++++++++++++++++- command.c | 45 +++++++++++++++++++++++++++++++++++++ input/input.c | 1 + libmpcodecs/vf.h | 2 + libmpcodecs/vf_vo.c | 4 +++ libvo/video_out.h | 3 ++ libvo/vo_vdpau.c | 59 +++++++++++++++++++++++++++++++++++++----------- libvo/vo_xv.c | 9 +++++++ libvo/x11_common.c | 8 +++++- 9 files changed, 137 insertions(+), 16 deletions(-) commit 201bef7ee150f9d852996b379c926ba0c47320d5 Author: Uoti Urpala Date: Sun Nov 15 04:39:22 2009 +0200 Implement vsync-aware frame timing for VDPAU Main things added are custom frame dropping for VDPAU to work around the display FPS limit, frame timing adjustment to avoid jitter when video frame times keep falling near vsyncs, and use of VDPAU's timing feature to keep one future frame queued in advance. NVIDIA's VDPAU implementation refuses to change the displayed frame more than once per vsync. This set a limit on how much video could be sped up, and caused problems for nearly all videos on low-FPS video projectors (playing 24 FPS video on a 24 FPS projector would not work reliably as MPlayer may need to slightly speed up the video for AV sync). This commit adds a framedrop mechanism that drops some frames so that no more than one is sent for display per vsync. The code tries to select the dropped frames smartly, selecting the best one to show for each vsync. Because of the timing features needed the drop functionality currently does not work if the correct-pts option is disabled. The code also adjusts frame timing slightly to avoid jitter. If you for example play 24 FPS video content on a 72 FPS display then normally a frame would be shown for 3 vsyncs, but if the frame times happen to fall near vsyncs and change between just before and just after then there could be frames alternating between 2 and 4 vsyncs. The code changes frame timing by up to one quarter vsync interval to avoid this. The above functionality depends on having reliable vsync timing information available. The display refresh rate is not directly provided by the VDPAU API. The current code uses information from the XF86VidMode extension if available; I'm not sure how common cases where that is inaccurate are. The refresh rate can be specified manually if necessary. After the changes in this commit MPlayer now always tries to keep one frame queued for future display using VDPAU's internal timing mechanism (however no more than 50 ms to the future). This should make video playback somewhat more robust against timing inaccuracies caused by system load. DOCS/man/en/mplayer.1 | 5 + TOOLS/vdpau_functions.py | 2 + libmenu/vf_menu.c | 2 +- libvo/vdpau_template.c | 2 + libvo/video_out.c | 7 +- libvo/video_out.h | 3 +- libvo/vo_vdpau.c | 230 +++++++++++++++++++++++++++++++++++++++++++--- libvo/x11_common.c | 12 +++ libvo/x11_common.h | 1 + mencoder.c | 2 +- mplayer.c | 30 ++++++- 11 files changed, 276 insertions(+), 20 deletions(-) commit b87ce8bc96657c0b2d9b7fc51ed4bc1661d53270 Author: Uoti Urpala Date: Wed Oct 14 04:12:10 2009 +0300 vo_vdpau: Modify frame buffering code Clean up code related to frame buffering and generate pts information also for the next frame in the output queue. The timing information will be used in a following framedrop patch. This commit adds one frame of buffering delay in vo_vdpau and increases the number of buffered vdpau video surfaces from 3 to 4. The delay increase makes it more important to fix remaining code in MPlayer that doesn't deal well with filter/VO delay; OTOH it should help any decoding/filtering parallelism in the underlying VDPAU implementation as now filtering a frame for display can happen while the next one is being decoded. libvo/video_out.c | 2 +- libvo/video_out.h | 3 + libvo/vo_vdpau.c | 131 +++++++++++++++++++++++++++++++---------------------- 3 files changed, 81 insertions(+), 55 deletions(-) commit b411278fbb00767b8013604157a43e0203f66f4c Author: cehoyos Date: Sat Nov 14 12:46:14 2009 +0000 Show OSD message when enabling/disabling de-interlacing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29912 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 2 ++ help/help_mp-en.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) commit c6bb4950bde24e9c5f2ded47e2525e7184c98beb Author: ptt Date: Fri Nov 13 15:26:16 2009 +0000 cosmetics and grammar fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29911 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) commit 2acbece5fb204a559ad95c8d0895811698443e8f Author: reimar Date: Fri Nov 13 14:36:38 2009 +0000 Add -tsprog support for lavf to mencoder, similar to what SVN r29846 did for mplayer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29910 b3059339-0415-0410-9bf9-f77b7e298cf2 mencoder.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 1de7fb056bac0a4883fb22ddbaeda4aec70e8b0e Author: jrash Date: Fri Nov 13 14:12:25 2009 +0000 sync with en/mplayer.1 r29905 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29909 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) commit fd35beaf0a51a45dc0df3e748edd196b56918283 Author: reimar Date: Fri Nov 13 13:21:59 2009 +0000 Check that mpctx->audio_out is not NULL when trying to uninit it. Make audio uninit consistent with e.g. the demuxer uninit code and also avoids a possible crash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29908 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 327414a2145356263b474a9b57cd2b05368fc49b Author: ptt Date: Fri Nov 13 07:54:30 2009 +0000 synced with r29905 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29907 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) commit cbda7a7bf49d4da01f826bd5ce0305de3b766aa6 Author: ptt Date: Thu Nov 12 17:04:41 2009 +0000 synced with r29885 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29906 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) commit 4147bee3e9282f22ed24dcdc44bdcf4908a28e01 Author: ptt Date: Thu Nov 12 10:39:52 2009 +0000 cosmetic fixes as pointed out by diego git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29905 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit ab4bdb64e1010be0b408012a79629d05a663b7a1 Author: ptt Date: Thu Nov 12 09:21:53 2009 +0000 Added -name, -title and -use-filename-title options and implementation in X11 vos git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29904 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 14 ++++++++++++++ cfg-mplayer.h | 5 +++++ libvo/video_out.c | 5 +++++ libvo/video_out.h | 3 +++ libvo/x11_common.c | 5 ++++- mplayer.c | 6 +++++- 6 files changed, 36 insertions(+), 2 deletions(-) commit 153cac185c2d38aef1c322ea3bfa2b97befbb8d9 Author: cehoyos Date: Wed Nov 11 22:26:38 2009 +0000 Do not dynamically load libvdpau.so.1, but link at compile time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29903 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 7 +++++-- libvo/vo_vdpau.c | 21 +-------------------- 2 files changed, 6 insertions(+), 22 deletions(-) commit 629eee5817083e42d20ff4176aceab0dc5a9f566 Author: tack Date: Wed Nov 11 15:15:46 2009 +0000 Replace dead link explaining why not to use HTML on the mailing lists. New link is http://efn.no/html-bad.html git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29902 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/xml/cs/bugreports.xml | 2 +- DOCS/xml/de/bugreports.xml | 2 +- DOCS/xml/en/bugreports.xml | 2 +- DOCS/xml/es/bugreports.xml | 2 +- DOCS/xml/fr/bugreports.xml | 2 +- DOCS/xml/hu/bugreports.xml | 2 +- DOCS/xml/it/bugreports.xml | 2 +- DOCS/xml/pl/bugreports.xml | 2 +- DOCS/xml/ru/bugreports.xml | 2 +- DOCS/xml/zh_CN/bugreports.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) commit 30ffc2dea40a5eca06ed7f9330f458c9f0346063 Author: reimar Date: Wed Nov 11 11:52:36 2009 +0000 Fix declarations in mp_taglists.h and include it in mp_taglists.c to make such mismatches impossible in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29901 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/mp_taglists.c | 1 + libmpdemux/mp_taglists.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) commit c62952a9acdeff0e6f084bc2936988762f57b80e Author: reimar Date: Wed Nov 11 11:38:41 2009 +0000 Add a "tips and tricks" section to the slave mode documentation. Hopefully will help in using some of its rather obscure features. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29900 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/slave.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit a63f28b99add9a1ce706d3299b391642e633c5ee Author: reimar Date: Wed Nov 11 11:35:28 2009 +0000 Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used tabs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29899 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 74 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 37 insertions(+), 37 deletions(-) commit 376aa9416fa6e1d6244e0a821b45282875e73afb Author: reimar Date: Wed Nov 11 11:31:36 2009 +0000 Do not call resume on unpausing if we have already reached eof while being paused (e.g. because of a "pausing_keep_force pt_step 1"). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29898 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 254b4855b1002f5f3d0912622bdccb8a771baa4f Author: reimar Date: Wed Nov 11 11:22:12 2009 +0000 Remember which subtitle was auto-selected for dvdnav due to -slang and if it is unchanged re-apply -slang on stream reset. This makes -slang work when used with menu navigation or in general when the subtitle is not available for parts of the playback or the subtitle stream ID changes during playback. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29897 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) commit d1e5bdf365db1a480bcbaccddcd79912c4eae998 Author: reimar Date: Wed Nov 11 11:19:50 2009 +0000 Factor out code that decides which subtitle to play. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29896 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 52 ++++++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 24 deletions(-) commit 05721f9672916da34d73693490842f5fe078535b Author: reimar Date: Wed Nov 11 11:09:36 2009 +0000 Avoid modifying dvdsub_id in command.c where possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29895 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 7694e9074d0242a0abe4d772cc54e334c80d049b Author: reimar Date: Wed Nov 11 09:28:21 2009 +0000 Move headers related to setting dvd speed to dvd_common. This makes -dvd-speed work again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29894 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvd.c | 14 -------------- stream/stream_dvd_common.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) commit 2bf260398ba7b6c39fbb8644be09888c408e4176 Author: reimar Date: Wed Nov 11 09:09:08 2009 +0000 Set the EOF flag when dvdnav reached the end of the requested title. Otherwise it would just hang, either at the menu or trying to play the last played frame as a still frame. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29893 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) commit 92ac5a8c209ba823330a53da69551d1a9fa6091a Author: reimar Date: Wed Nov 11 09:03:39 2009 +0000 Support the range syntax (like dvd://2-5) also for dvdnav. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29892 b3059339-0415-0410-9bf9-f77b7e298cf2 parser-mpcmd.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit 977c12c62886060895cb83ad82ef71b7c302d5f6 Author: cehoyos Date: Wed Nov 11 00:30:54 2009 +0000 10l: Fix compilation without VDPAU. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29891 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0d40667c8cf05c8957ad2e1bfec41ca41c88888a Author: reimar Date: Tue Nov 10 23:20:05 2009 +0000 Move dvd_speed and dvd_set_speed to dvd_common and implement -dvd-speed support for dvdnav. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29890 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvd.c | 73 ------------------------------------------- stream/stream_dvd_common.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ stream/stream_dvd_common.h | 2 + stream/stream_dvdnav.c | 3 ++ 4 files changed, 79 insertions(+), 73 deletions(-) commit 36ec82183681b5c751026e2c2d121cb4bd5bc87b Author: reimar Date: Tue Nov 10 23:15:48 2009 +0000 Move arrays used by both dvd and dvdnav to dvd_common. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29889 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvd.c | 3 --- stream/stream_dvd_common.c | 3 +++ stream/stream_dvd_common.h | 3 +++ stream/stream_dvdnav.c | 2 -- 4 files changed, 6 insertions(+), 5 deletions(-) commit 80217b424035375d5887f1da7cacd2b1c242f63c Author: reimar Date: Tue Nov 10 23:12:01 2009 +0000 Remove unused extern declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29888 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 8f164e07a00a82b2a7cde6b617c896e35e4ee9e1 Author: reimar Date: Tue Nov 10 23:10:57 2009 +0000 Share dvd_device extern declaration between dvd and dvdnav. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29887 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvd.c | 1 - stream/stream_dvd_common.h | 1 + stream/stream_dvdnav.c | 1 - 3 files changed, 1 insertions(+), 2 deletions(-) commit 6e8f1e844f4f446369cc4ebc1abf362c37b3ebf2 Author: reimar Date: Tue Nov 10 23:03:52 2009 +0000 Remove an unused variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29886 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2b93a48ac8e092a74001b406ed9a20b6025faee6 Author: cehoyos Date: Tue Nov 10 19:11:13 2009 +0000 Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable hardware. Original patch by NVIDIA corporation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 3 ++- codec-cfg.c | 1 + etc/codecs.conf | 31 +++++++++++++++++++++++++++++++ fmt-conversion.c | 1 + libmpcodecs/img_format.c | 1 + libmpcodecs/img_format.h | 1 + libswscale/swscale.c | 2 ++ libvo/vo_vdpau.c | 4 ++++ 8 files changed, 43 insertions(+), 1 deletions(-) commit a63e8dce213e797cbf4c955f28ed03b0fabda0b9 Author: diego Date: Tue Nov 10 18:10:16 2009 +0000 Map AV_LOG_VERBOSE to MSGL_V in order to avoid spurious log output. based on a patch by On2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29884 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/vd_ffmpeg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit c61f1c20c21f3c3675b32bd4f09535762a035a49 Author: tack Date: Tue Nov 10 18:01:10 2009 +0000 Update man page to reflect support for up to 8 channels. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29883 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) commit 085f35f4b48766a5740c7802e4a9a7d809f73441 Author: reimar Date: Tue Nov 10 16:49:00 2009 +0000 Allow lavf demuxer to also probe and play files < 32 kB (full probe buffer size). Based on patch by On2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29882 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 5fd17a2c073abc2c674e81cdca761f390a5a4e08 Author: reimar Date: Tue Nov 10 16:24:16 2009 +0000 Calculate length of ASF files with more than 1 second precision. Based on patch by On2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29881 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/asf.h | 2 +- libmpdemux/asfheader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 48938efe63933b07c0ca54b81296f54088370709 Author: reimar Date: Tue Nov 10 16:19:44 2009 +0000 Fix length calculation for ASF, preroll is in ms, play time in 100 ns. Based on patch by On2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29880 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/asfheader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit af9c1fbda36bdc896e7800834ffe0070ad87060d Author: reimar Date: Tue Nov 10 16:15:39 2009 +0000 Remove useless cast git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29879 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_asf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 10c5301519750191b2e9892b75a459f32f522eea Author: tack Date: Tue Nov 10 14:52:56 2009 +0000 Changelog: add note that 8 channel audio is now supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29878 b3059339-0415-0410-9bf9-f77b7e298cf2 Changelog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 42ec82c1e53a7ee17bc4855acf3d83b2cd7b7a00 Author: reimar Date: Tue Nov 10 13:08:36 2009 +0000 Use configure code to define PIC instead of duplicating the check in mangle.h. While it is currently not necessary, it might be a good idea to move this outside the x86-only block in configure, as well as adding -pie to LDFLAGS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29877 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 3 +-- mangle.h | 4 ---- 2 files changed, 1 insertions(+), 6 deletions(-) commit 4ca9381eaefeedbbd22f31eaa3ce90221ed69d53 Author: zuxy Date: Tue Nov 10 11:51:22 2009 +0000 Delete "auto-close" from configuration whose support has long been removed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29876 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/menu.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9a8a73e547dd662bce82cfe52fde37dd7409f1d2 Author: reimar Date: Tue Nov 10 11:31:47 2009 +0000 Add support for DVB teletext. Patch by Francesco Lavra [francescolavra interfree it] with modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29875 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 3 ++- libmpcodecs/dec_teletext.c | 26 ++++++++++++++++++++++++++ libmpcodecs/dec_teletext.h | 1 + mpcommon.c | 24 +++++++++++++++++++++++- 4 files changed, 52 insertions(+), 2 deletions(-) commit 1135e23dfc98a161a4da78519fa200f2c982a064 Author: reimar Date: Tue Nov 10 11:26:03 2009 +0000 Free demuxer->teletext when closing the demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29874 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit bd82936f6353c29d9ef11e9eafe944771dcd2db3 Author: reimar Date: Tue Nov 10 11:24:29 2009 +0000 Set demuxer->teletext to NULL when closing the TV interface, since analog teletext can not (yet) work without the TV interface. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29873 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/tv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 78290719a61eed47dda8c7524de93e436c7f5fd5 Author: cehoyos Date: Tue Nov 10 10:40:34 2009 +0000 100: Fix function parameters when calling create_vdp_decoder() from query_format(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29872 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 88d80c23615eee927c92ac5366536c307ea8c48a Author: cehoyos Date: Tue Nov 10 10:05:10 2009 +0000 Cosmetics: Fix indentation after last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29871 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3865c166c91155bf1f29a902491661eef36f72e2 Author: cehoyos Date: Tue Nov 10 10:04:32 2009 +0000 Fail in query_format() if a VDPAU decoder is not available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29870 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) commit 7c774fd5ceb56d40790c4bde9da84f7eae71b133 Author: cehoyos Date: Tue Nov 10 09:52:43 2009 +0000 Add a default to switch(image_format), suppresses a warning after a future patch. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29869 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 3c2afd67861769e82034b2ca276d2670964fc09c Author: tack Date: Tue Nov 10 00:45:19 2009 +0000 Add support for 8 channel audio. Where 8 channel support is non-trivial (e.g. ao_dsound), at least ensure we fail gracefully. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29868 b3059339-0415-0410-9bf9-f77b7e298cf2 cfg-common-opts.h | 2 +- libaf/af.h | 2 +- libaf/af_volume.c | 2 +- libaf/reorder_ch.c | 194 ++++++++++++++++++++++++++++++++++++++++++++++--- libaf/reorder_ch.h | 10 +++ libao2/ao_alsa.c | 7 ++ libao2/ao_dsound.c | 7 ++- libao2/ao_pcm.c | 2 +- libmpcodecs/ad_faad.c | 5 +- libmpcodecs/ae_pcm.c | 3 +- 10 files changed, 215 insertions(+), 19 deletions(-) commit 1d30062395914bbc9eef1299c70018df9f333628 Author: tack Date: Tue Nov 10 00:43:14 2009 +0000 Cosmetics: remove trailing whitespace from file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29867 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/reorder_ch.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit a4434cf2d7fc46fadc91f5d1853edaa0e32a896a Author: reimar Date: Mon Nov 9 15:37:15 2009 +0000 Properly free the pthread mutex for teletext. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29866 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_teletext.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 263e4a1144d903f6421ab2f86fc4e031657241a1 Author: reimar Date: Mon Nov 9 15:34:55 2009 +0000 Allow teletext compilation without pthreads git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29865 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_teletext.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) commit 4b55351e28d06e02f19e1f5bff62abf71cb8455b Author: reimar Date: Mon Nov 9 15:17:06 2009 +0000 Fix compilation of teletext code without freetype support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29864 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/sub.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 509475ec2c85c0456584b0596176280c51f11cd6 Author: reimar Date: Mon Nov 9 15:11:54 2009 +0000 Change type of teletext color specification from unsigned char to static const uint8_t git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29863 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/sub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7f8d660be5da7f676f7c6f7bb1b4dff6ca9a0e62 Author: reimar Date: Mon Nov 9 15:04:57 2009 +0000 Make sure the teletext property stuff does not crash if no demuxer is available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29862 b3059339-0415-0410-9bf9-f77b7e298cf2 command.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 87a4e870b706f45f348d28e3d2c7749072344392 Author: reimar Date: Mon Nov 9 14:12:14 2009 +0000 The code for the non-networking case is the same whether networking support was enabled or no, so avoid duplicating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29861 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) commit 0d782226c1428214d7c73263897459a21d5636f4 Author: reimar Date: Mon Nov 9 14:08:35 2009 +0000 Factor out triplicated break statement. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29860 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit a144a22453e94ef5d5d01eb8491836fcd4c8ee6e Author: reimar Date: Mon Nov 9 10:29:15 2009 +0000 Remove unused mp_dvdnav_aid_from_audio_num function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29859 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) commit 2dfd5e5f535292c491bc967a8a8e4d109d9c5965 Author: reimar Date: Mon Nov 9 10:27:48 2009 +0000 Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and dvdnav_get_spu_logical_stream both take the same numbering (i.e. not the ids used in the MPEG-TS). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29858 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) commit bc1ee4ca037499d31ef9a397ce2fba68d4f5b5a8 Author: cehoyos Date: Sun Nov 8 23:31:43 2009 +0000 Use enum PixelFormat instead of int for srcFormat and dstFormat. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29857 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale_template.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) commit 3cc24f5bee4366be1d0d98743a07f739739df444 Author: reimar Date: Sun Nov 8 19:32:57 2009 +0000 Remove macho64 special-case for yasm options, -DPIC is already added by the PIC-detection code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29856 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 4c3dc1b10ba728b2f5f9cae43ad29c02a91157e6 Author: reimar Date: Sun Nov 8 15:41:40 2009 +0000 Remove a pointless undeclared function reference, #error is assumed to be enough to fail cc_check all over the place already. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29855 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 2ccdd44e844e82d42934265ed8f51de1df787c2f Author: reimar Date: Sun Nov 8 15:39:54 2009 +0000 Add a comment that the PIC handling in mangle.h is duplicate also in configure and libavutil and fixes to one should be applied to the others, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29854 b3059339-0415-0410-9bf9-f77b7e298cf2 mangle.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit e1ce8f9c41bd9273a283dd0826ef0898c2a63763 Author: reimar Date: Sun Nov 8 15:38:59 2009 +0000 Add a check if compiler creates PIC code and if so add -DPIC to YASMFLAGS. Should make it possible to compile MPlayer as PIE on x86_64 e.g. on hardened Gentoo and probably OpenBSD, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29853 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) commit cc807663bfdfa6d7d2b25785d0ff1a8a674c04c9 Author: reimar Date: Sun Nov 8 15:01:05 2009 +0000 Clarify possible issues with gmplayer commandline options due to conflicts with separate gui configuration file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29852 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 2a5611473cb3696597240be15b0e1e662c1c79b8 Author: cehoyos Date: Sat Nov 7 16:40:42 2009 +0000 Remove CONFIG_TV_TELETEXT. DVB teletext support is nearly finished, it will be possible to read teletext from file, it will not be depending on reception any more. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- cfg-common.h | 2 -- command.c | 10 ---------- configure | 25 ------------------------- input/input.c | 4 ---- libmpcodecs/dec_teletext.h | 4 ---- libvo/sub.c | 10 ---------- mpcommon.c | 2 -- stream/tvi_dshow.c | 12 ------------ stream/tvi_v4l.c | 11 ----------- stream/tvi_v4l2.c | 12 ------------ 11 files changed, 1 insertions(+), 93 deletions(-) commit 241164f72c01b4e15e7afff36064a9217ebad77f Author: cehoyos Date: Sat Nov 7 13:09:24 2009 +0000 Factorise vbi_decode(). Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29850 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_teletext.c | 69 +++++++++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 30 deletions(-) commit 419e4f684af2a885804f54f403b41d9761e1052f Author: cehoyos Date: Sat Nov 7 12:55:07 2009 +0000 Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT. Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29849 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 423c415534f7393c07247b87ab4d95f6d0635474 Author: cehoyos Date: Sat Nov 7 12:31:05 2009 +0000 Separate teletext from tv support. Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2 cfg-common.h | 8 ++++---- command.c | 37 ++++++++++++++++++------------------- configure | 2 +- libmpcodecs/dec_teletext.c | 11 +++++------ libmpcodecs/dec_teletext.h | 11 +++++++++++ libmpdemux/demuxer.h | 3 +++ mpcommon.c | 17 ++++++++--------- stream/tv.c | 21 +++++++++++++++------ stream/tv.h | 10 ++++++---- stream/tvi_dshow.c | 7 ++++--- stream/tvi_v4l.c | 5 +++-- stream/tvi_v4l2.c | 5 +++-- 12 files changed, 81 insertions(+), 56 deletions(-) commit 1698db0726e4b7c11f4dc47dfc823df5ab1cd80d Author: reimar Date: Sat Nov 7 11:15:26 2009 +0000 Remove pointless and broken (e.g. does not set aid and vid) -tsprog handling from lavf demuxer, mplayer.c makes sure IDENTIFY_PROGRAM is called with the right arguments, and that code actually works in contrast to the one in demux_open_lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29847 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) commit 36a0a355987f8619a6a93be5797b3ef9d0141903 Author: reimar Date: Sat Nov 7 11:12:56 2009 +0000 Use switch_program property from mplayer.c to set ts_prog. This seems to leave the ts demuxer unaffected, but fixes -tsprog with the lavf demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29846 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 25f0498660e8c335ddad8aa2019de0e94a2f156b Author: reimar Date: Sat Nov 7 11:09:23 2009 +0000 Remove an empty program if the one requested by IDENTIFY_PROGRAM does not exist instead of incorrectly claiming that the demuxer does not support programs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29845 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_lavf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 35918325154651910a618843638ea4b9cf89edd0 Author: stefano Date: Sat Nov 7 09:23:11 2009 +0000 Document sws_freeContext(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29844 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit b963af59f1d30704c2e47979bfe9d544eadc0d6b Author: reimar Date: Fri Nov 6 16:16:22 2009 +0000 Whitespace cosmetics: reindent reinit_audio_chain function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29843 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 84 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 42 insertions(+), 42 deletions(-) commit 89c9b3b769e0affe2fa6d176440d85aa3d62a680 Author: reimar Date: Fri Nov 6 16:11:58 2009 +0000 Remove some useless comments/commented-out code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29842 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 477057dbb5c2b3e395f52be95e2182eaa368cfdd Author: reimar Date: Fri Nov 6 16:10:19 2009 +0000 Split assignment from error value check to avoid overcomplicated if () condition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29841 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit e83addcbfa94015783d80f2979acce7aae512df8 Author: reimar Date: Fri Nov 6 16:08:00 2009 +0000 Reuse the init_error exit path also for init_best_audio_codec errors. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29840 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit bf80f3595889328ce777792531f092673853e931 Author: reimar Date: Fri Nov 6 16:06:33 2009 +0000 Simplify: use &= instead of a = b & a; git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29839 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9edfe2046e8898a8eefd6b98b9a7c2f7ae5ed4aa Author: reimar Date: Fri Nov 6 16:04:39 2009 +0000 Remove some unnecessary else blocks git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29838 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit f4926132f80a160ee64fbdfe2468f12d6b829076 Author: reimar Date: Fri Nov 6 15:59:42 2009 +0000 Use an early return instead of a {} block over the whole function in reinit_audio_chain git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29837 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit fefbdf991b0427c3b32d9333fedccdaf91a9a50e Author: reimar Date: Fri Nov 6 15:56:30 2009 +0000 Disable audio when initializing the filter chain fails (can happen e.g. when the hwmpa decoder is used but the hardware does not support hardware MPEG audio). Otherwise this will lead to a crash later on when the decode code tries to access the audio filter chain. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29836 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) commit c6b1e6880b39160b1a37ab0b4fc0c3ca29ff7367 Author: reimar Date: Fri Nov 6 15:45:55 2009 +0000 Only call avcodec_close if the open succeeded before, otherwise avcodec_close will crash (happens e.g. when encoding ends before any frames were actually encoded, e.g. when an MPEG file was cut down to much so it no longer contains a full video frame). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29835 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ve_lavc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 87e2b02f7ab91fe5855d5010e5280226f3627bc6 Author: attila Date: Fri Nov 6 14:06:58 2009 +0000 PPC: make inline asm xform address test work with Apple tools original from mru, ffmpeg commit r20466 adapted to mplayer by Emanuele Giaquinta (exg) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29834 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit cc057549fbcc1044791a4b48f7da715fa96e4164 Author: jrash Date: Fri Nov 6 12:30:56 2009 +0000 sync with en/mplayer.1 r29823 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29833 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) commit ef479d9d01905143b8309557d6b77d4155f6a378 Author: reimar Date: Thu Nov 5 21:29:14 2009 +0000 dvdnav: print ID_SID_..._LANG, just like dvd:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29832 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit c76ea256def0de246c8e7127cf0fe48872f3278d Author: reimar Date: Thu Nov 5 21:27:25 2009 +0000 Cosmetics: indentation, merge two consecutive ifs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29831 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) commit 503fe2eb9c9b2f073ce58c6bab2af727ba577740 Author: reimar Date: Thu Nov 5 21:26:23 2009 +0000 Make dvdnav also print info about audio streams with unknown language, just like dvd:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29830 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b00d649d985cdd2154be916f3f448c978523becc Author: reimar Date: Thu Nov 5 21:22:38 2009 +0000 Make the dvdnav stream language information output more similar to the dvd one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29829 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) commit f46ede9a6b449f0b2c084cb3580180e2def39263 Author: reimar Date: Thu Nov 5 21:13:38 2009 +0000 Change the subtitle numbers in the dvdnav subtitle language info to match the numbers used by MPlayer's OSD and -sid option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29828 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvdnav.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7566e72f775941c0a0ff3234e0e718cf36d91f56 Author: reimar Date: Thu Nov 5 20:59:46 2009 +0000 Change dvdnav_reset_stream to not disable subtitles, since that breaks selecting the subtitle via -slang or -sid. It is quite possible that removing it will cause other issues, though I could not see any with the DVDs I had available for testing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29827 b3059339-0415-0410-9bf9-f77b7e298cf2 mplayer.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 9c0834b0f6c063602285eb6a8343a767955d27e6 Author: reimar Date: Thu Nov 5 19:05:42 2009 +0000 Add cast to signed for 64 bit check, since according to an FFmpeg bug report some compilers (llvm?) do not fail when arrays larger than the maximum addressable size are declared but instead just silently generate broken code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29826 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4532c8ad2f8db6ed7320b907dba67b23de7972b1 Author: reimar Date: Thu Nov 5 18:53:05 2009 +0000 Add a profile example and (commented-out) useful defaults for dvdnav to example.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29825 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/example.conf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 3efb64e34e2a9078a89392ef0a3bc15fdbcf8a30 Author: reynaldo Date: Thu Nov 5 04:12:39 2009 +0000 So Long, and Thanks for All the Fish git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29824 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/MAINTAINERS | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit a10b3f08bffd9d71d34abccbb3966b5113976c8c Author: cehoyos Date: Wed Nov 4 15:30:13 2009 +0000 Add new VDPAU feature high-quality-scaling (and require newer library). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 7 +++++++ configure | 2 +- libvo/vo_vdpau.c | 10 +++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) commit ecbbbacb50141535858b35b967dba02582cab12d Author: Kovenksy Date: Wed Nov 4 09:39:10 2009 -0300 Silence the "No bind" message input/input.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) commit 90ebb9b31da12a526e0d8f573b80b2ffbb67b28b Author: Kovenksy Date: Wed Nov 4 09:28:49 2009 -0300 Restore a52 as the default AC-3 decoder It mysteriously unbroke for some unknown reason. Maybe miscompilation? Moreover, ffac3 breaks with the mpeg-ps decoder. etc/codecs.conf | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) commit b6712cc6c214088be7abd3ed14b1897abc3054f2 Author: tack Date: Wed Nov 4 00:58:11 2009 +0000 reorder_ch: Remove unneeded AF_CHANNEL_LAYOUT_LAVC_AAC_DEC_* All references to these values were removed r29821. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29822 b3059339-0415-0410-9bf9-f77b7e298cf2 libaf/reorder_ch.c | 2 -- libaf/reorder_ch.h | 5 +---- 2 files changed, 1 insertions(+), 6 deletions(-) commit b88d08040e365295fe9bf4ff717fdb1d728fe87b Author: tack Date: Wed Nov 4 00:54:46 2009 +0000 ad_ffmpeg: Fix channel layout for ffvorbis and ffaac Patch submitted by Nicolas George, nicolas.george normalesup org The layout exceptions removed by this patch were rendered unnecessary by changes in ffmpeg which normalize channel layout for aac (r20067) and vorbis (r20148). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29821 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/ad_ffmpeg.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) commit fe57d3e844a277b8c15592489b4d1071120f5565 Author: compn Date: Tue Nov 3 23:54:32 2009 +0000 cosmetics: alphabetize git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29820 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/mp_taglists.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f4578bf65597e4b69f1d996fe06403ded9f57434 Author: compn Date: Tue Nov 3 23:45:11 2009 +0000 10l for breaking compilation. change eatgv to tgv git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29819 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/mp_taglists.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 11cc4bcadbf6c280f8967596854c087355652c00 Author: reynaldo Date: Tue Nov 3 20:46:54 2009 +0000 Remove unneeded initialization git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29818 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/x11_common.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 47271a8598487344a5de13774dfa042954e51a7e Author: compn Date: Tue Nov 3 20:18:47 2009 +0000 add yuvs fourcc, fixes yuvs.mov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29817 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 869aad500ef7c0bf18c78876a578c236dbb63de7 Author: compn Date: Tue Nov 3 20:03:37 2009 +0000 add ffmpeg eatgv codec patch by Jan Engelhardt jengelh ta medozas.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29816 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 7 +++++++ libmpdemux/mp_taglists.c | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) commit 76c5520d7490061f3210bc4200f62fc59ac12744 Author: compn Date: Tue Nov 3 19:45:43 2009 +0000 add audio format 0x55005354 to mp3, fixes unknown_audio_codec.avi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29815 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 4ccaa41db0e3a444206ccd3fbbcb0c92375d2f3e Author: diego Date: Mon Nov 2 22:32:47 2009 +0000 The "ilaced" suboption of vf_scale was renamed to "interlaced". Fixes Bugzilla #1596. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29814 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/de/mplayer.1 | 4 ++-- DOCS/man/en/mplayer.1 | 4 ++-- DOCS/man/fr/mplayer.1 | 4 ++-- DOCS/man/hu/mplayer.1 | 4 ++-- DOCS/man/it/mplayer.1 | 4 ++-- DOCS/man/ru/mplayer.1 | 4 ++-- DOCS/man/zh_CN/mplayer.1 | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) commit dbe7c02a7866ce8851b87b363171308fc564ef9c Author: cehoyos Date: Mon Nov 2 16:42:37 2009 +0000 Improve VDPAU noforce-mixer documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29813 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit ce2300b4379664de39c5d526df948c5dd9ba1f7f Author: uau Date: Mon Nov 2 01:40:09 2009 +0000 demuxer.c: Add initialization missing from previous commit Reimar's previous commit ("Unbreak the demuxer-specific code in video.c with e.g.") added the new field "non_interleaved" in demux_stream structs, but this field was not initialized anywhere. Under suitable circumstances this could cause a "Too many video/audio packets in the buffer" error and failing playback. Fix the problem by cleaning up the code that creates new instances of the struct. Now fields will be initialized to 0 by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29812 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demuxer.c | 26 +++++--------------------- 1 files changed, 5 insertions(+), 21 deletions(-) commit b0d6753723f4b5ada75d20793be0118d63dfea5c Author: compn Date: Mon Nov 2 00:11:30 2009 +0000 add VYUY and Y42B fourccs to rawcodecs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29811 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 1280614c9f3dd85ba1fa2f19f0b4d40f011bb8ee Author: reimar Date: Sun Nov 1 09:48:34 2009 +0000 Unbreak the demuxer-specific code in video.c with e.g. -audiofile by moving the code to manually interleave subtitles to mp_common.c. video.c should still be changed to not be demuxer-specific anymore, it is bad practice but fully fixing it is non-trivial. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29810 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_demuxers.c | 6 ++++++ libmpdemux/demuxer.h | 2 ++ mpcommon.c | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) commit cc8b0decf22063bda7439fe23db53a68aeb16b47 Merge: 6fc8a13 8bbb79c Author: Kovenksy Date: Sat Oct 31 19:24:07 2009 -0300 Merge with upstream commit 8bbb79c03a594e452fb9109dd6fda781d390a798 Author: Uoti Urpala Date: Sat Oct 31 23:03:48 2009 +0200 av_log callback handling overhaul Move av_log callback handling from vd_ffmpeg.c to a new file av_log.c and install the callback immediately when starting the program. Main functionality improvements of the new code: - The old version only installed the callback when opening an FFmpeg video decoder. If nothing had triggered that then av_log() messages from other sources (libavformat, audio decoding, swscale usage) bypassed MPlayer's output system completely. Now the callback is always installed. - Current av_log message severity levels are handled correctly. The old code used MSGL_ERR for some messages that should be MSGL_V. - Message type is now set for libavformat contexts (MSGT_DEMUXER / MSGT_MUXER). - The old code did "mp_msg_test(type, mp_level)" before actually determining the type, so that it always used MSGT_FIXME. This led to some messages being incorrectly dropped in case the user had specified module-specific verbosity levels. The old check in question was originally motivated by performance problems when there were a lot of callbacks; however it's not clear whether the part about it skipping the type determination was intentional (most of the performance problems must have come from the way the original code used snprintf) and in my tests current FFmpeg libraries have not generated unreasonable amounts of callbacks anyway. Makefile | 1 + av_log.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ av_log.h | 1 + libmpcodecs/vd_ffmpeg.c | 51 --------------------- mencoder.c | 2 + mplayer.c | 2 + 6 files changed, 117 insertions(+), 51 deletions(-) commit 6fc8a1375401016d97c61494f11231ac47e3db19 Author: Kovenksy Date: Sat Oct 31 12:36:54 2009 -0300 Add used configure options Also added --enable-ffmpeg, so I have a ffmpeg.exe to copy over for testing / encoding. build/i586-mingw32msvc/ffmpeg_options | 1 + build/msys-mingw32/common_options | 9 +++++++++ build/msys-mingw32/ffmpeg_options | 21 +++++++++++++++++++++ build/msys-mingw32/libass_options | 6 ++++++ build/msys-mingw32/mplayer_options | 16 ++++++++++++++++ 5 files changed, 53 insertions(+), 0 deletions(-) commit b55f8108759bb3a02c5f92b6b8b5f79ee9a2ea1d Author: Kovenksy Date: Sat Oct 31 12:35:01 2009 -0300 Updated ffmpeg build/ffmpeg | 2 +- build/ffmpeg-mt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit e9942166df28c0ae14566eab9d7a7e6011faafab Author: cehoyos Date: Sat Oct 31 15:34:18 2009 +0000 Teletext display does support font scaling via OSD font scaling, remove TODO item. Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29809 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_teletext.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 631d5f1f84675d474cb120803f62d03a2c973947 Author: cehoyos Date: Sat Oct 31 15:30:56 2009 +0000 Replace two more occurences of tvi_vbi with dec_teletext. Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29808 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_teletext.c | 4 ++-- stream/tv.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 91943aa9fae7e5a7a85ffbe7ad2c632729fb6110 Author: cehoyos Date: Sat Oct 31 15:28:28 2009 +0000 Remove incorrect comment. Original patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29807 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_teletext.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit ffb717be28d4772328f124d08807365571693e68 Author: jrash Date: Sat Oct 31 02:00:00 2009 +0000 sync with en/mplayer.1 r29805 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29806 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/zh_CN/mplayer.1 | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-) commit 0746f99a0afa22aac84823b96c1757659616786e Author: corey Date: Fri Oct 30 22:18:29 2009 +0000 Slightly change behavior of "none" if fstype specification. In a list of enabled fstypes, "none" now clears the list rather than disabling all fstypes and interrupting the parser. To enable only one (or more) fstypes, list the types to enable after "none". For example: "-fstype none" is the same as before: all disabled "-fstype none,fullscreen" enables only the fullscreen type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29805 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- libvo/x11_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 9e259c79bd078bea84346e8a22979f81d8b971b8 Author: stefano Date: Fri Oct 30 14:13:25 2009 +0000 Document slice ordering assumption done by sws_scale(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29804 b3059339-0415-0410-9bf9-f77b7e298cf2 libswscale/swscale.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 88397d63f1463e2f01c8b64f5c01aca61bce8e27 Author: cehoyos Date: Fri Oct 30 10:03:54 2009 +0000 Support ISDB-Tb tunning in Brazil Patch by Sérgio Fortier, sergiofortier A yahoo com br git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29803 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/stream_dvb.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) commit 9df11ee8bf234aebcea76ef8c919fb68229c7308 Author: cehoyos Date: Thu Oct 29 22:39:00 2009 +0000 Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some paths in comments. Based on a patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29802 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/dec_teletext.c | 114 ++++++++++++++++++++++---------------------- libmpcodecs/dec_teletext.h | 4 ++ mp_msg.h | 2 + mpcommon.c | 10 ++-- stream/tvi_dshow.c | 2 +- stream/tvi_v4l.c | 2 +- stream/tvi_v4l2.c | 2 +- 7 files changed, 71 insertions(+), 65 deletions(-) commit a9474b0b39b999ef17163bec9337a96a72ddb458 Author: cehoyos Date: Thu Oct 29 22:13:04 2009 +0000 Move teletext specific code from stream into libmpcodecs. Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 2 +- command.c | 1 + libmpcodecs/dec_teletext.c | 1851 ++++++++++++++++++++++++++++++++++++++++++++ libmpcodecs/dec_teletext.h | 136 ++++ libvo/sub.c | 2 +- mpcommon.c | 1 + stream/tv.c | 1 + stream/tv.h | 108 --- stream/tvi_def.h | 2 - stream/tvi_dshow.c | 1 + stream/tvi_v4l.c | 1 + stream/tvi_v4l2.c | 1 + stream/tvi_vbi.c | 1850 ------------------------------------------- 13 files changed, 1995 insertions(+), 1962 deletions(-) commit f86cab4ecc5ca22bcfd2fc723e2fbb7b020b0b25 Author: diego Date: Wed Oct 28 13:55:18 2009 +0000 consistency fix: Give all CONFIG_ definitions the value 1. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29800 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) commit 7800998a95cc144127ac971a5f1cde2385b055f8 Author: cehoyos Date: Tue Oct 27 08:29:07 2009 +0000 Cosmetics: Reindent after last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29799 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 29c937fe80d9bfea8fa9305fd5de2d16e3ab848c Author: cehoyos Date: Tue Oct 27 08:28:08 2009 +0000 Allow image format BGRA when using vo vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29798 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 4 ++++ libvo/vo_vdpau.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) commit 406c8a2b5bd0a2bda1e8ba2e38b8aa089efdfb27 Author: reimar Date: Mon Oct 26 22:15:19 2009 +0000 Move 64 bit check below compiler detection since it needs the compiler and obviously should use the one that will be used for compiling in the end. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29797 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) commit 5496f51711b6abf5c1b8f7df97f18548f7e7aa65 Merge: 314c6fc 4a35807 Author: Kovenksy Date: Sat Oct 24 10:21:59 2009 -0300 Merge commit 'uau/tmp_build' commit 1198f65d0b69cd6c78781e12f355a95ef15b3086 Author: cehoyos Date: Sat Oct 24 13:19:20 2009 +0000 Fix teletext character set auto-detection. Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29796 b3059339-0415-0410-9bf9-f77b7e298cf2 stream/tvi_vbi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3d264d7b55c91547afb7ea8b0fbbf0e5f4dd27f1 Author: diego Date: Sat Oct 24 12:35:18 2009 +0000 Move some variable initializations to the beginning of vo_x11_fullscreen(). Fixes the warnings: libvo/x11_common.c:1344: warning: 'h' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'w' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'y' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'x' may be used uninitialized in this function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29795 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/x11_common.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) commit fbf26ecb14f7187a132e3d2cfab8c386475cd059 Author: cehoyos Date: Fri Oct 23 18:26:42 2009 +0000 Implement VFCAP_FLIP for vo_vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29794 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit 4a8b396b31237c81647d34b575ba69f00ec7148d Author: cehoyos Date: Thu Oct 22 18:44:39 2009 +0000 Free memory allocated in ff_vdpau_add_data_chunk() on uninit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29793 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit a59c8e7d6a0c5dc1a89e2a0f90cdfae002fa22e5 Author: ptt Date: Thu Oct 22 15:40:04 2009 +0000 synced with r29791 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29792 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 9e9c609a369be0c0b8eafa7f1ff6ba99d0d6dd05 Author: diego Date: Thu Oct 22 14:19:10 2009 +0000 Break an output line for consistency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29791 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 789ad059d1bddf77180a77556a1a89bd16b7e7f8 Author: ptt Date: Thu Oct 22 14:06:38 2009 +0000 cosmetic fixes in bs2b and vdpau sections git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29790 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit 37713cb3ec2ad1c05dbc828ad94e12cd4ea4f574 Author: Uoti Urpala Date: Thu Oct 22 04:21:14 2009 +0300 cosmetics: Add two missing "static" Add missing 'static' to internal functions in vo_xv.c and vo_vdpau.c. libvo/vo_vdpau.c | 2 +- libvo/vo_xv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit fa7983b236a219da83ed73a461d58605b69575da Author: Uoti Urpala Date: Wed Oct 21 05:32:36 2009 +0300 vf: Remove unused VFCTRL_FLIP_PAGE Nothing uses it under MPlayer any more, and under MEncoder it never had any effect. libmpcodecs/vf.h | 1 - libmpcodecs/vf_tfields.c | 6 ------ libmpcodecs/vf_vo.c | 6 ------ libmpcodecs/vf_yadif.c | 2 -- 4 files changed, 0 insertions(+), 15 deletions(-) commit b2ebe306216b510c064f716e09cdd7440dcda2f0 Author: compn Date: Tue Oct 20 16:26:30 2009 +0000 add V422, YUNV to rawyuy2 add UYNV,UYNY,uyv1,2Vu1 to rawuyvy add P422 to raw422P works on samples/V-codecs/. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29789 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit e4a3a38398c5b7d81feb957dc766edde07a96cb6 Author: compn Date: Tue Oct 20 15:47:36 2009 +0000 add HDYC fourcc to rawuyvy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29788 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit e155d3d9f910508273b15990eb75e9de5fa67671 Author: lorenm Date: Mon Oct 19 21:23:08 2009 +0000 sync to x264-r1296 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 2 +- libmpcodecs/ve_x264.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4a35807e7272ee61882e597003a512e07f004f27 Author: Uoti Urpala Date: Mon Oct 19 23:54:36 2009 +0300 build: Support x264 version 78 configure | 2 +- libmpcodecs/ve_x264.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit b2e3df350aeec14da52b1eec7d25c8c7595f617a Author: cehoyos Date: Mon Oct 19 15:47:59 2009 +0000 Fix playback of Intel JPEG Library Video Codec. Fixes r29770, which probably should not have been committed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29786 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) commit 59d4f35fc3321b156cb15e746567a39fcff34a07 Author: diego Date: Mon Oct 19 10:09:58 2009 +0000 Fix aspect test program linking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29785 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/aspecttest.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit fc1b468117d333ca5630f7842a4c3d412389ec91 Author: diego Date: Mon Oct 19 09:56:18 2009 +0000 Get rid of COMMON_LDFLAGS variable. It was a pointless indirection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 11 ++++------- configure | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) commit d87e0718d832901ae782134c1f8192d39cf5368e Author: diego Date: Mon Oct 19 09:50:51 2009 +0000 Add missing '#include "config.h"', the header uses HAVE_BIGENDIAN. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29783 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpcodecs/img_format.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 1d823d4b0fd3709cc02eef539e9f48bb3e798034 Author: diego Date: Mon Oct 19 09:41:30 2009 +0000 Add CONFIG_LPC to config.h as well (needed by FFmpeg). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29782 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 7210df9cb9c0ec8246643037caf822d2207e6db7 Author: diego Date: Mon Oct 19 09:10:27 2009 +0000 Add CONFIG_LPC to config.mak (needed by FFmpeg). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29781 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 0c3633c9ffcf78ea317e1f48a36063830044bf8d Author: compn Date: Mon Oct 19 03:45:14 2009 +0000 add binary codec for fourcc slif git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29780 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit da278b3184f5abf4bea6f547c691586b239b4c41 Author: diego Date: Sun Oct 18 18:44:51 2009 +0000 Merge rules for building mencoder and mplayer. Just the dependencies are different, so specify them separately. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29779 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 47f0629f1a3898f11f4789eafa6bb11bee162cfc Author: diego Date: Sun Oct 18 18:41:35 2009 +0000 Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables. They are only used in one place so the indirection is pointless. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29778 b3059339-0415-0410-9bf9-f77b7e298cf2 Makefile | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) commit 786df56047e5d0f7a867e53fbd8195fb03b819f5 Author: Uoti Urpala Date: Sat Oct 17 20:30:49 2009 +0300 demux_mkv: Stop moving FLAC extradata into stream packets The Matroska demuxer didn't place FLAC codec extradata in the normal extradata field but instead constructed a fake data packet and inserted that at the start of the demuxer stream. Current FFmpeg FLAC decoder can read the data from the proper extradata field too, so use that mechanism instead. This fixes a problem with files that use ordered chapters to load external segments from other files that have FLAC audio. In that case there can be a seek before the audio decoder is first initialized, and the seek will flush all stream packets so the decoder would never see the inserted extra packet. That particular issue could be fixed by initializing the decoder before any seeks instead (and there could still be other similar problem cases where doing that would be more robust), but this change is still generally right. I think the previous code would also cause problems in case there are multiple audio streams; there's only a single demuxer stream used for data packets, meaning that a packet inserted for the sake of a secondary audio stream could be read by the codec of the default stream (possibly not FLAC at all) and the packet would not be available when switching to the secondary audio stream later. libmpdemux/demux_mkv.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) commit c34564f2f6cac3c01bd88b431ea3da4d98d49d28 Author: cehoyos Date: Sat Oct 17 15:15:07 2009 +0000 Try to recover from VDPAU display pre-emptions. Original patch by Uoti. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29777 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) commit ae7068047a394183ab548919482d60939c4f69b8 Author: reimar Date: Fri Oct 16 08:42:00 2009 +0000 Find and take into account stream start time for ogg files. This also makes the demuxing function set the keyframe flag for vorbis packets that aren't header packets and have a time stamp, even if we do not have vorbis_info struct yet. The reason for this is that header packets always have 0 as time stamp. Fixes bug #1585 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29776 b3059339-0415-0410-9bf9-f77b7e298cf2 libmpdemux/demux_ogg.c | 53 ++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 19 deletions(-) commit e3bc0549dd86c68675e05c992b864b21229a3be4 Author: compn Date: Thu Oct 15 04:49:56 2009 +0000 add MVJP fourcc (mjpeg) from ffmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29775 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 45e11b74d045c1357b6e3788358425f099e20b3d Author: reimar Date: Wed Oct 14 19:19:20 2009 +0000 Add support for "Forward Uncompressed" decoding via FFmpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29774 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit e8be11765a1e57946687cfa959166127b9c603a0 Author: ptt Date: Wed Oct 14 11:27:12 2009 +0000 removed daniele forghieri from italian man mantainers (as said by diego and him) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29773 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 581a08677ca7f4d48414478f341b24af07da02c1 Author: ptt Date: Wed Oct 14 11:26:04 2009 +0000 synced with r29771 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29772 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) commit 14c5e64fd915dc0cdd3656dec3711ff820b14e2e Author: cehoyos Date: Mon Oct 12 21:17:38 2009 +0000 Support SMPTE-240M colourspace in vo_vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29771 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 2 ++ libvo/vo_vdpau.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) commit b635519bbf52d87ce304a3f509fd3f11b2ab8d31 Author: cehoyos Date: Sun Oct 11 11:31:50 2009 +0000 Allow playback of files with FourCC IJLV (Intel JPEG Library Video Codec). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29770 b3059339-0415-0410-9bf9-f77b7e298cf2 etc/codecs.conf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 83fe8c63c52c45c1d149248be651e60055b685d7 Author: cehoyos Date: Sat Oct 10 20:53:42 2009 +0000 Add colorspace option to vo_vdpau. Allows to use ITU-R BT.709 instead of the default ITU-R BT.601. Patch by Lauri Mylläri, lauri D myllari gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29769 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 16 +++++++++++++++ libvo/vo_vdpau.c | 51 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 55 insertions(+), 12 deletions(-) commit 510a5f268cf0a10f3b70800af781c96205f668a1 Author: adrian Date: Sat Oct 10 10:39:05 2009 +0000 Remove redundant duplicate option handling in the playtree. Fixes the use of options on the command line which should not override each other (like -vf-add). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29768 b3059339-0415-0410-9bf9-f77b7e298cf2 playtree.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) commit 7199cc3c4de2ab5bde7d71dfe860dac996b69563 Author: reimar Date: Sat Oct 10 09:27:22 2009 +0000 Implement dummy EncodePointer/DecodePointer functions needed for e.g. lagarith.dll git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29767 b3059339-0415-0410-9bf9-f77b7e298cf2 loader/win32.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) commit 5069d954b0353f7b4e3c8ebe0ac513f38a7f852f Author: ptt Date: Thu Oct 8 17:44:23 2009 +0000 some coherence's fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29766 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit 5d60341790d8bd567a034ca7fad1840cbd754c18 Author: ptt Date: Thu Oct 8 17:40:47 2009 +0000 cosmetics in channels/capture sections git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29765 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit c72ef416cad0f90b490a80fb54a17212b6faf9c7 Author: ptt Date: Thu Oct 8 16:59:36 2009 +0000 synced with r29762 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29764 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 202 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 183 insertions(+), 19 deletions(-) commit 9514824cf9697b207a804fc3626a071b489642a8 Author: ptt Date: Thu Oct 8 16:45:24 2009 +0000 added myself to italian man mantainers section, since i'm the one that does that git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29763 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/tech/MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2781bab3aff4312ce2de7ef12187120c96308980 Author: ptt Date: Thu Oct 8 16:42:56 2009 +0000 various little aesthetic fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29762 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) commit f43c06930f8e5161e8b4ef079dec04eed99d942e Author: Uoti Urpala Date: Thu Oct 8 19:42:03 2009 +0300 manpage: Fix typo in -noordered-chapters option name The manual page said "-noorderedchapters" without a hyphen while the actual option name is "-noordered-chapters". DOCS/man/en/mplayer.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2df6aba009d93999e0e2205ceacb0bcdeae7a4fd Author: diego Date: Thu Oct 8 11:32:17 2009 +0000 Fix 100l typo introduced in last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29761 b3059339-0415-0410-9bf9-f77b7e298cf2 mp3lib/sr1.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6aef595f93a1d7fff355f5d097d7833641933484 Author: ptt Date: Thu Oct 8 11:31:24 2009 +0000 synced with r28576 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29760 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/it/mplayer.1 | 158 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 107 insertions(+), 51 deletions(-) commit 50f563f9279f01a9f2177cac84178b153365f037 Author: diego Date: Thu Oct 8 11:25:01 2009 +0000 cosmetics: Remove some pointless parentheses from return calls. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2 drivers/mga_vid.c | 2 +- libvo/vo_vdpau.c | 4 ++-- mp3lib/sr1.c | 10 +++++----- mp3lib/test.c | 2 +- stream/dvb_tune.c | 8 ++++---- stream/stream_dvdnav.c | 6 +++--- stream/tv.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) commit 77bc2b34b7c8c36d21bee5a48cd73a0e110122f8 Author: diego Date: Thu Oct 8 10:48:12 2009 +0000 cosmetics: Break two more lines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29758 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 04ba27ba95ce2dd92d37f2651397b65721202d0c Author: ptt Date: Thu Oct 8 10:18:19 2009 +0000 Updated to help_mp-en.h r29742 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29757 b3059339-0415-0410-9bf9-f77b7e298cf2 help/help_mp-it.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit ad4e739ffa12bb30fe52ed173547463582aa3bd0 Author: diego Date: Tue Oct 6 12:38:06 2009 +0000 Clarify screenshot filter description. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29756 b3059339-0415-0410-9bf9-f77b7e298cf2 DOCS/man/en/mplayer.1 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 95e061d93b2e237f3bd460f9811b05320eb28daa Author: diego Date: Tue Oct 6 08:45:20 2009 +0000 K&R coding style and whitespace cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29755 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/vo_vdpau.c | 332 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 170 insertions(+), 162 deletions(-) commit 28f36c36568004ae696f8cb1b4887d7fca64274b Author: adrian Date: Tue Oct 6 08:21:52 2009 +0000 Add keycode definitions for older versions of OSX. Fixes compilation on 10.4. Patch by Aaro Koskinen, aaro D koskinen A iki D fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29754 b3059339-0415-0410-9bf9-f77b7e298cf2 libvo/osx_common.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) commit 07c11742a94deb8c2c2493afe3b81870c10f1e93 Author: reimar Date: Tue Oct 6 06:43:00 2009 +0000 Remove many uses of tmp_run. Checking that installed header and library match is not really our task, also if desired it would be more correct to do it at runtime (e.g. because of distributed binaries, or system updates gone wrong, ...). tmp_run also slows down configure on systems with slow fork like MinGW. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29753 b3059339-0415-0410-9bf9-f77b7e298cf2 configure | 46 ++++++++++++---------------------------------- 1 files changed, 12 insertions(+), 34 deletions(-)