summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* build: remove separate mp_msg-mencoder.cUoti Urpala2010-03-092-6/+2
| | | | | | mp_msg-mencoder.c was separate from mp_msg.c only to compile a version without a GUI dependency when the internal GUI was enabled. Since the GUI has been removed the same mp_msg.o can be linked in all binaries.
* Ignore svn change r30464Uoti Urpala2010-03-090-0/+0
|\ | | | | | | Useless FFmpeg build stuff.
| * Add some more definitions for FFmpeg to config.h:diego2010-01-301-0/+3
| | | | | | | | | | | | | | | | | | HAVE_ATTRIBUTE_MAY_ALIAS HAVE_STRUCT_IPV6_MREQ HAVE_STRUCT_SOCKADDR_IN6 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30464 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30463Uoti Urpala2010-03-09159-115/+2730
|\| | | | | | | | | | | Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
| * Add missing license headers to all files in the libmpcodecs directory.diego2010-01-30135-64/+2461
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove confusing comment.diego2010-01-301-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30462 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing license headers.diego2010-01-302-4/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30461 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Convert DOS linebreaks to Unix linebreaks.diego2010-01-301-17/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30460 b3059339-0415-0410-9bf9-f77b7e298cf2
| * license header cosmeticsdiego2010-01-302-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30459 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add standard license header to C tools missing them.diego2010-01-3010-8/+158
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30458 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix randomness of the swscale-test output.stefano2010-01-301-3/+3
| | | | | | | | | | | | | | | | | | See the thread: Subject: [FFmpeg-devel] [RFC] Make swscale-test perform only one convertion Date: Fri, 29 Jan 2010 01:52:23 +0100 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30457 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing license header and multiple inclusion guards.diego2010-01-301-0/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30456 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the code match the documentation by making higher-quality but slowerreimar2010-01-301-11/+0
| | | | | | | | | | | | | | | | audio filtering the default. This mostly means lavcresample being the default instead of plain "resample". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30455 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support more qscale types in most post-processing filters.reimar2010-01-295-4/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30454 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r30436jrash2010-01-291-2/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30453 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explain why we still disable the ALSA resampler even though it is probablyreimar2010-01-281-1/+2
| | | | | | | | | | | | | | actually working nowadays. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30452 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try the more specific names first for the SwapInterval function to make it lessreimar2010-01-281-1/+1
| | | | | | | | | | | | | | likely we get an incompatible one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30451 b3059339-0415-0410-9bf9-f77b7e298cf2
| * glXSwapIntervalEXT is defined to take different arguments from ↵reimar2010-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | glXSwapIntervalSGI, so do not try to use it. Patch by Stephen Warren [swarren nvidia com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30450 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix input/output channel mixup in the pan filter description.diego2010-01-281-2/+2
| | | | | | | | | | | | | | patch by Heikki Rauhala, hvrauhal gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30449 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demuxer.h: increase input buffer padding to 64 to match FFmpegUoti Urpala2010-03-091-1/+1
| | | | | | | | | | | | FFmpeg increased the amount of padding that must be readable beyond input buffers without SIGSEGV from 8 to 64, and the MPlayer value must be changed accordingly.
* | Add runtime translation supportUoti Urpala2010-03-083-2/+92
| | | | | | | | | | | | Add support for gettext-based runtime translations. Enabled with configure switch --enable-translation (no autodetection). Note that no translation files are installed yet.
* | translations: tweak cases that relied on concatenating adjacent stringsUoti Urpala2010-03-0713-41/+64
| | | | | | | | | | | | | | | | Tweak some code parts that used to rely on string literals from translation macros being concatenated with other adjacent string literals. Break up the resulting string into independently translated parts, so that the existing translations for those parts can still be used.
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-0716-23/+23
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | Make help text translatableUoti Urpala2010-03-072-3/+43
| | | | | | | | | | | | Translate help_text and also make all CONF_TYPE_PRINT option output translatable (though no translations exist yet for anything other than the main help text).
* | build/vdpau: drop support for dynamic loading of libvdpauUoti Urpala2010-02-262-28/+7
| | | | | | | | | | | | | | | | | | | | After a recent library update on my system MPlayer started crashing on exit in XCloseDisplay() if -vo vdpau had been used. With normal linking it works OK. Since there should be little need for the dynamic loading functionality any more, I'll just drop it rather than try investigating the exact problem with dynamic loading and whether it would be fixable. VDPAU is now linked normally with -lvdpau if available.
* | vo_vdpau: improve VOCTRL_GET_EOSD_RES codeUoti Urpala2010-02-261-10/+4
| | | | | | | | | | | | | | | | Remove the special case for fullscreen; the same variables should have the correct values in windowed and fullscreen modes. This fixes libass subtitle positioning in the (non-typical) case where you have black bands inside a window. Behavior in fullscreen and in the typical windowed case without borders should not be affected.
* | Makefile: vf_halfpack no longer needs libswscale internalsUoti Urpala2010-02-261-2/+2
| | | | | | | | | | vf_halfpack now uses only the public libswscale API, so compile it unconditionally.
* | Add FLV4 fourcc to ffvp6f decoderGrigori Goronzy2010-02-241-1/+1
| | | | | | | | | | Some Flash videos use this fourcc and several websites indicate this is a standard fourcc for Flash VP6 content.
* | vo_vdpau: make queuing future frame flips adjustableUoti Urpala2010-02-054-4/+27
| | | | | | | | | | | | | | | | | | | | 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).
* | ad_faad: move message "input bitrate missing" to MSGL_VUoti Urpala2010-01-311-1/+1
| | | | | | | | | | | | 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.
* | VO: remove directfb from autoselected VOsUoti Urpala2010-01-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | 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.
* | codecs.conf: stop trying mpegpes first for MPEG-1/2Uoti Urpala2010-01-301-31/+30
| | | | | | | | | | | | 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.
* | demux_mkv: remove incorrect error message about compressionUoti Urpala2010-01-281-1/+1
| | | | | | | | | | | | The demuxer still printed a message about "unknown/unsupported compression algorithm (3)" even though that is now supported and in fact played fine.
* | x11_common: always free x11 context struct on exitUoti Urpala2010-01-281-7/+6
| | | | | | | | | | Previously it was not freed if no X11 display had been opened (for example -vo null).
* | Merge branch 'matroska'Uoti Urpala2010-01-2810-1273/+2286
|\ \
| * | demux_mkv: improve compression handlingUoti Urpala2010-01-271-26/+34
| | | | | | | | | | | | | | | | | | | | | 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).
| * | demux_mkv: use new EBML parser to read all track headersUoti Urpala2010-01-271-227/+135
| | |
| * | demux_mkv: handle compressed text subtitlesUoti Urpala2010-01-271-3/+6
| | | | | | | | | | | | | | | | | | | | | 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.
| * | demux_mkv: don't print errors for 0-size zlib decodingUoti Urpala2010-01-271-0/+4
| | | | | | | | | | | | | | | | | | 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.
| * | demux_mkv: use new EBML parser to read TrackEncodingsUoti Urpala2010-01-271-151/+67
| | |
| * | demux_mkv: use new EBML parser to read Video elementUoti Urpala2010-01-271-61/+33
| | |
| * | demux_mkv: use new EBML parser to read Audio elementUoti Urpala2010-01-273-45/+25
| | |
| * | demux_mkv: use new EBML parser for Info parsingUoti Urpala2010-01-271-51/+29
| | |
| * | demux_mkv: remove pointless 'long double' useUoti Urpala2010-01-273-6/+6
| | | | | | | | | | | | | | | There was no remaining reason to use this type. The variables were assigned values with plain double precision anyway.
| * | demux_mkv: use new EBML parser for chapter parsingUoti Urpala2010-01-271-198/+101
| | |
| * | demux_mkv: use new EBML parser for attachment parsingUoti Urpala2010-01-271-80/+21
| | |
| * | demux: take chapter/attachment name strings without 0-terminationUoti Urpala2010-01-274-42/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | demux_mkv: don't stop playback on non-Cluster elementsUoti Urpala2010-01-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | demux_mkv: improve Cues parsingUoti Urpala2010-01-271-65/+18
| | | | | | | | | | | | | | | | | | | | | 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).
| * | demux_mkv: support reading all headers based on SeekHeadUoti Urpala2010-01-271-150/+148
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | demux_mkv: use new EBML parser for file headerUoti Urpala2010-01-273-79/+29
| | |
| * | matroska: add new parsing codeUoti Urpala2010-01-277-172/+1675
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge svn changes up to r30448Uoti Urpala2010-01-283-33/+26
|\ \ \ | | |/ | |/|
| * | Stopping maintainership for -vo (x)mga attila2010-01-271-2/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30448 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Simplify and correct loop condition, also avoids a compiler warning for ↵reimar2010-01-271-2/+2
| | | | | | | | | | | | | | | | | | unused result. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30447 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Fix newline removal code that might read and write out of bounds.reimar2010-01-272-4/+4
| | | | | |