summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30446 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Make mp3lib the default MP3 decoder again, it is a good bit faster onreimar2010-01-271-14/+17
| | | | | | | | | | | | | | | | | | | | | standard desktop hardware. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30445 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Declare variable closer to where it is used.reimar2010-01-271-9/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30444 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove a useless global variable.reimar2010-01-271-5/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30443 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Do not needlessly make local variable static.reimar2010-01-271-3/+3
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30442 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove useless initializers.reimar2010-01-271-2/+2
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30441 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Ignore svn changes up to r30440Uoti Urpala2010-01-280-0/+0
|\| | | | | | | | | | | | | | Two not relevant to current code in git and r30440 was already fixed last year.
| * | Do not needlessly use (file-)global variables.reimar2010-01-271-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Rename swscale-example to swscale-test, to better reflect the intendedstefano2010-01-272-2/+1
| | | | | | | | | | | | | | | | | | | | | use of the program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30439 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove ds_fill_buffer calls from demux_resync, they cause issues at least withreimar2010-01-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge svn changes up to r30437Uoti Urpala2010-01-289-15/+59
|\| |
| * | Enable parsing for ASF audio streams.reimar2010-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | 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
| * | Add an option to cropdetect to periodically reset the detected area.reimar2010-01-262-5/+24
| | | | | | | | | | | | | | | | | | | | | Patch by [quetschke scytek de] with modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30436 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Use isAnyRGB() where possiblemichael2010-01-263-13/+11
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30435 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add 3 more RGB makros that allow specifying RGB in bytes and any rgb/bgr.michael2010-01-261-0/+16
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30434 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Rename isRGB() and isBGR() as their meaning is confusing.michael2010-01-264-19/+19
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30433 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks, slightlystefano2010-01-251-2/+0
| | | | | | | | | | | | | | | | | | | | | simplify code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30432 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Fix mis-computation of the needsDither variable erroneously introducedstefano2010-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Use av_malloc to ensure sufficient alignment and also free at least somereimar2010-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | | of the allocated memory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30430 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | If audio was identified as DTS in the PMT do not override that with TrueHDreimar2010-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fail ad_pcm initialization of WAVEFORMATEX header is missing instead of ↵reimar2010-01-241-0/+2
| | | | | | | | | | | | | | | | | | crashing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30428 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add support for parsing MLP and TrueHD.reimar2010-01-241-0/+6
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30427 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Revert the xvmc part of r30422: VCR2 at least worked with xvmc at some point.cehoyos2010-01-241-0/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30426 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks.stefano2010-01-241-2/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30425 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Add forgotten declaration of ds_clear_parser.reimar2010-01-241-0/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30424 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Remove now unused variables.reimar2010-01-241-2/+0
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | VCR2 fails for mpeg12, decodes incorrectly (and cannot be fixed) forcehoyos2010-01-241-4/+0
| | | | | | | | | | | | | | | | | | | | | 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
| * | Reset the parser on seek. Should fix some cases of audio "blips" after seeking.reimar2010-01-242-6/+24
| | | | | | | | | | | | | | | | | | | | | 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
* | | Ignore svn change r30420Uoti Urpala2010-01-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Move the resync-related code into more consistent places instead of having itreimar2010-01-245-42/+28
| | | | | | | | | | | | | | | | | | | | | 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
* | | Disable libass fallbacks for fontconfig < 2.4.2Grigori Goronzy2010-01-276-29/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge svn changes up to r30419Uoti Urpala2010-01-2535-135/+274
|\| |
| * | Use av_get_bits_per_pixel() for computing the bits per pixel of thestefano2010-01-244-46/+12
| | | | | | | | | | | | | | | | | | | |