Commit Graph
30911 Commits
Author SHA1 Message Date
Uoti Urpala 1872284cdc 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.
2010-01-31 02:05:37 +02:00
Uoti Urpala 8c225fbe0d 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.
2010-01-30 23:33:31 +02:00
Uoti Urpala 4a3de78aae 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.
2010-01-28 17:21:01 +02:00
Uoti Urpala 42244dd2a4 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).
2010-01-28 01:12:34 +02:00
Uoti Urpala c710c5ee50 Merge branch 'matroska' 2010-01-28 00:56:26 +02:00
Uoti Urpala d84685ce13 Merge svn changes up to r30448 2010-01-28 00:54:08 +02:00
Uoti Urpala 79ab199322 Ignore svn changes up to r30440
Two not relevant to current code in git and r30440 was already fixed
last year.
2010-01-28 00:39:46 +02:00
Uoti Urpala 6ece23f1b1 Merge svn changes up to r30437 2010-01-28 00:37:32 +02:00
Uoti Urpala 167322fa33 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.
2010-01-28 00:26:22 +02:00
attila 9b6b3ff08c Stopping maintainership for -vo (x)mga
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30448 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 22:22:50 +00:00
reimar 1a7b69f7f2 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
2010-01-27 19:45:16 +00:00
reimar 4526f4da65 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
2010-01-27 19:42:24 +00:00
reimar d1ec4a57ba 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
2010-01-27 19:15:49 +00:00
reimar 4c211d8851 Declare variable closer to where it is used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30444 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:23:19 +00:00
reimar 882ce0cd5e Remove a useless global variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30443 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:21:27 +00:00
reimar 5f326498f7 Do not needlessly make local variable static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30442 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:16:41 +00:00
reimar 051d3210c7 Remove useless initializers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30441 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 18:11:15 +00:00
reimar 01a39f2fc3 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
2010-01-27 18:10:07 +00:00
Uoti Urpala 55c50b3f99 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).
2010-01-27 14:26:49 +02:00
Uoti Urpala 1b22101c77 demux_mkv: use new EBML parser to read all track headers 2010-01-27 14:26:49 +02:00
Uoti Urpala 2fd4dc45de 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.
2010-01-27 14:26:49 +02:00
Uoti Urpala 16ee636a58 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.
2010-01-27 14:26:48 +02:00
Uoti Urpala 51fc1f839b demux_mkv: use new EBML parser to read TrackEncodings 2010-01-27 14:26:48 +02:00
Uoti Urpala 7ecafde34f demux_mkv: use new EBML parser to read Video element 2010-01-27 14:26:48 +02:00
Uoti Urpala db41501f23 demux_mkv: use new EBML parser to read Audio element 2010-01-27 14:26:48 +02:00
Uoti Urpala fc907b7488 demux_mkv: use new EBML parser for Info parsing 2010-01-27 14:26:48 +02:00
Uoti Urpala a07cfb35d3 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.
2010-01-27 14:26:48 +02:00
Uoti Urpala 6e7531c4be demux_mkv: use new EBML parser for chapter parsing 2010-01-27 14:26:48 +02:00
Uoti Urpala 8c0e224097 demux_mkv: use new EBML parser for attachment parsing 2010-01-27 14:26:48 +02:00
Uoti Urpala 49b80fe6b4 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.
2010-01-27 14:26:48 +02:00
Uoti Urpala 298808cddc 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.
2010-01-27 14:26:48 +02:00
Uoti Urpala d8a6af2980 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).
2010-01-27 14:26:48 +02:00
Uoti Urpala f90e9a86d1 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.
2010-01-27 14:26:48 +02:00
Uoti Urpala 8b0726b28a demux_mkv: use new EBML parser for file header 2010-01-27 14:26:48 +02:00
Uoti Urpala 5f631d1c08 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.
2010-01-27 14:26:43 +02:00
Grigori Goronzy 42a87fc611 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.
2010-01-27 12:46:59 +02:00
stefano 7be89f904d 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
2010-01-27 00:25:23 +00:00
reimar cc95355a0a 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
2010-01-26 21:08:01 +00:00
reimar b1f3c590c7 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
2010-01-26 18:19:57 +00:00
reimar d83fb575cf 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
2010-01-26 18:15:58 +00:00
michael 156399b7aa Use isAnyRGB() where possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30435 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 08:03:28 +00:00
michael 60b76a958f 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
2010-01-26 08:01:50 +00:00
michael 378e6bf192 Rename isRGB() and isBGR() as their meaning is confusing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30433 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 07:40:14 +00:00
stefano 2cded4ef2c 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
2010-01-25 22:46:09 +00:00
Uoti Urpala e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
Uoti Urpala 560acfd040 Ignore svn changes up to r30385
libswscale / internal FFmpeg build stuff.
2010-01-25 15:37:54 +02:00
Uoti Urpala 4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala efd25f7811 Ignore svn changes up to r30324
Internal FFmpeg build stuff.
2010-01-25 15:19:03 +02:00
Uoti Urpala ff2df2ac54 Merge svn changes up to r30322 2010-01-25 15:17:50 +02:00
Uoti Urpala 8dd016c538 Ignore svn changes up to r30306
libswcale / internal FFmpeg build stuff.
2010-01-25 15:09:19 +02:00