1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Commit Graph

32109 Commits

Author SHA1 Message Date
reimar
d6322407c5 subs: change subdelay handling and vobsub timing
Make subdelay handling work the same way for all subtitle types and
also allow changing subtitle delay to work better with vobsubs.
This probably breaks vobsub behaviour with timestamp wrapping though.

Positive values for sub delay now delay subtitles compared to video,
where before the effect was in the opposite direction.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31663 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar
1882a37adb spudec.c: simplify
Reuse spudec_visible to avoid code duplication.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31661 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar
4a9c879ca7 spudec: Add warning about bad values in bounding box handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31660 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar
dd70420bb8 spudec.c: Extract image allocation code to a separate function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31659 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:37 +02:00
reimar
8200a8d532 stream.c: add <libavutil/common.h> include needed for GET_UTF16
Patch by Erik Auerswald {auerswal unix-ag.uni-kl.de}

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31658 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:35 +02:00
reimar
6c3c1588f5 libgsm: Remove libgsm wrapper
Remove copy of old and ugly libgsm code and wrapper.
Decoding these formats is supported via FFmpeg both natively and
through libgsm.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31657 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31664 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:22 +02:00
reimar
4d83c67b5c codecs.conf: Add/fix GSM audio decoding through FFmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31656 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
jrash
9fc71c777c DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31648
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31652 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
cehoyos
b3c3a40c6e vo_gl: remove "broken" comment from quadbuffer stereo
Independent tests indicate that GLX_STEREO is working fine on
supported hardware.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31647 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31648 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
aurel
d7a9c6d240 demux_lavf: stricter check for convergence_duration validity
Avoid using meaningless values

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31642 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
ben
4662ea6409 stream_bluray: implement slave mode compatible controls
Added stream controls: get/set for chapters and angles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31640 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
4e151f79e9 vo_gl: Some small whitespace and {} cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31639 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
14d00a65e9 vo_gl: Try to get a quadbuffered visual for corresponding 3D mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31638 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
42a8c42eb2 vo_gl: cleanup
Move declaration to where it is actually used.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31636 b3059339-0415-0410-9bf9-f77b7e298cf2

Use a more sensible variable name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31637 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
f743dceceb manpage: Fix outdated -vo gl usage example.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31634 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
ccb6675fbd vo_gl: Add initial stereo support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31633 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego
a19ea9c966 DOCS/man/cs: Fix Bulgarian vs. Hungarian typo in Czech manual page.
patch by Petr Vorel, pevik seznam cz

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31632 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
ben
6704008a46 stream_bluray: add unencrypted Blu-ray playback
Support for unencrypted Blu-ray playback through libbluray.
Use it through: mplayer br:////path/to/disc

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31631 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
95751ea3e4 Windows support: add a manifest file
Add a manifest file to disable file and registry "virtualization" on
Windows.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31630 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
a874569db6 codecs.conf: Support libgsm via libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31629 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
63b69b312c mp_msg.c: Avoid out-of-bounds read if empty string is printed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31626 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
61ed4c2945 x11_common: Get window dimensions also for -wid 0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31623 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
efdce758ce x11_common.c: minor cleanup
Remove some commented-out code that has no purpose and is only confusing.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31620 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove useless ()

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31621 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego
5583369c98 configure: Add return statement to function_check test program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31617 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego
ce9dc765af configure: use cflag_check function for more cases
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31616 b3059339-0415-0410-9bf9-f77b7e298cf2

Use cflag_check utility function in cross-compilation check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31618 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego
853dc929e4 configure: Separate dependency flags from general CFLAGS
Before, there was an unfortunate interaction with 'make checkheaders':
Compiling a .h file would generate a .d dependency information file for
that .h file as a sideeffect of compilation. Unfortunately this would
clobber the .d files of the .c files with the same basename, resulting
in broken dependency information when running plain make.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31614 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego
948fa5d070 configure: add function to check compiler flags directly
Add a convenience function to check for compiler flags directly
without specifying a test program, and modify tests to use it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31613 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
diego
e9a53cd1e9 configure: Rename _warn_CFLAGS variable to warn_cflags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31612 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
96b385bc79 vd_xanim.c: Give functions proper prototypes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31611 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
fc95b0d5f3 asfguid.h: Use AV_RL32 also in x86
It is well enough optimized nowadays.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31610 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
077c9025bf vf_geq: Fix function prototypes to match the required type.
Fixes "initialization from incompatible pointer type" warnings.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31609 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:19 +02:00
reimar
caf32aef3f af_export: Avoid void *-arithmentic warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31608 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:19 +02:00
reimar
2308e045de cleanup: Add const qualifiers for struct ad_functions pointers
The ad_functions structs are in rodata, mark some pointers to them
const.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31606 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:02 +02:00
attila
4a0f67ca35 ad_faad: fix compilation using external libfaad
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31603 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
reimar
4fc7f3b296 x11_common.c: Some indentation fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31602 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
reimar
1e159f4ecc x11_common: Do not try to grab input from -wid windows
It will most likely break their input processing.
If someone needs the previous behaviour, an option could be added (and
also used in the w32_common.c code).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31601 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix resizing with -wid after previous commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31604 b3059339-0415-0410-9bf9-f77b7e298cf2

Always request expose events, we have to handle them, the application
that created the -wid window can't.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31605 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
reimar
30d7c19b69 vo_gl: Fix -geometry with -wid behaviour (y position was flipped)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31600 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
reimar
d1455cac3c DOCS/tech/slave.txt: Add disabling input to hints
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31595 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
diego
bd5aaa5468 configure: Add function to check for particular function in header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31593 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
diego
9ac700bc1a configure: Place temporary files in a subdirectory of their own
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31592 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix variable name for tmpdir selection iterator.
Temporary directories should now be properly created on Linux.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31594 b3059339-0415-0410-9bf9-f77b7e298cf2

config.log belongs into mplayer's root directory, not into the tmp directory

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31596 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
diego
d86aad3d56 ad_mpg123: add MP3 decoding through libmpg123
patch by Thomas Orgis, thomas-forum orgis org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:46 +02:00
astrange
a701c81f6d configure: Fix detection of SDL backend for vo_gl on OS X
SDL overrides main, and provides a prototype for SDL_main
which uses argc and argv. Since the prototype didn't match
the main() in the test program, it failed to compile, making
the test fail when it should have worked.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31589 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
reimar
b8ab283f91 vidix/pci.c: Add config.h include
Needed for other included files in sysdep/.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31588 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
reimar
815460d289 demux_lavf: Avoid a crash if stream->url is not set
Print a warning since this is not supposed to happen.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31587 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
diego
e2dea75e4a vd_ffmpeg: add av_unused attribute to swap_palette()
Only used on bigendian machines.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31586 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
cehoyos
d4aefd6d74 codecs.conf: Update ffvp8 comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31585 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
diego
8ec2a3ae72 DOCS/xml/Makefile: Remove help target that prints available targets
The Makefile should now be simple enough to understand without it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31583 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
diego
a1b8092c87 Factorize MPlayer/MEncoder version string handling.
The string now resides in a central object file instead of
being duplicated in every file that requires a version string.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
cehoyos
055f411ce3 codecs.conf: change ffvp8 status from "buggy" to "working"
ffvp8 decodes all reference vectors fine.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31576 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
reimar
5701c30061 configure: Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31572 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00