1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 21:12:23 +00:00
Commit Graph

32192 Commits

Author SHA1 Message Date
reimar
a13a629669 manpage: Fix wrong option name in input example
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31813 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
59524e7a3f vo_corevideo, vo_quartz: remove useless kQuitCmd
Remove kQuitCmd, it has no purpose or effect at all.

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

Remove unused kQuitCmd from vo_quartz.
While just as useless as for corevideo, the "Quit"
menu item at least works through kHICommandQuit here.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31812 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
79662b6f19 vo_corevideo: indentation fixes
Cosmetics: indentation fixes.

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

Fix indentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31810 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
465839a395 vo_corevideo: Avoid some code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31809 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
f4f8c1f7e9 vo_corevideo: Simplify update_screen_info
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31806 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid some code duplication in update_screen_info.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31807 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
0a5ff5eef3 vo_corevideo: avoid dangerous casts
Declare variables with proper types to avoid dangerous pointer casts.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31805 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
5f5a12a939 vo_corevideo.m: remote useless parentheses and casts
Remove useless ().

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

Remove yet more useless ()

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

Remove pointless casts.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31804 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
2fa911a6f5 vo_corevideo: Send KEY_CLOSE_WIN instead of KEY_ESC for quit
Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested
corevideo to quit, KEY_ESC might have been rebound to something else.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31801 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
68200fa565 spudec.c: Slightly simplify rle decoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31799 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
599647ff8c spudec.c: Remove a useless condition check
It's already handled a few lines further down (the len == 0 check).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31798 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
63cc56045a spudec.c: Avoid useless malloc/frees
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31797 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused variables.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31800 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
2b895d9349 command.c: Change cast to avoid a warning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31795 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
6ab9a83398 slave mode: Add stream_time_pos property
Patch by Paul Huwe [reicow yahoo com] with some modifications by me.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31794 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
37097806be spudec.c: Remove useless NULL checks before free()
Also set pointers to NULL after freeing.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31792 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
a5e9d3b56a spudec: Allocate memory for paletted image data separately
Use a separate allocation to avoid issues with e.g. the "cut" function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31791 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
4533ea0d55 spudec: Slightly simplify dvd subtitle RLE decoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31790 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
af62b02a63 spudec: Share paletted -> gray/alpha conversion code
Also keep a copy of the raw rle-decoded data. Should simplify
implementing palette changes and the rle decoding code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31789 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
dd886133a9 spudec: Simplify creation of color/alpha map
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31788 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
cbe036312a vobsub: Only try to merge packets if we have an earlier one stored
Based on patch by 191919 [191919 gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31787 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
7fe4aa9a3b vd_qtvideo: Some indentation fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31785 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
56599fe4a4 vd_qtvideo: generate a ImageDescription if not given
Generate a ImageDescription if none is passed neither via ImageDesc nor
extradata.
Makes the ProRes decoder work with -demuxer lavf.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31784 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
jrash
15365874f9 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31769
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31774 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
7db422b384 manpage: mention -af stats in -af volume section for statistics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31769 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
85392a8875 manpage: -af volume "max volume" feature requires floats
Printing maximum volume only works when prefering float format.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31762 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
f5ef880227 vo_gl2: Use identical code to -vo gl for -wid mode
Fixes the same bugs (no video, video at wrong location...).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31750 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
diego
578ad534b3 configure: Rename "network" variable and option to "networking"
This avoids conflicts with the FFmpeg variable of the same name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
fea2d4dd45 configure: Fix LADSPA test variable initialization
Don't use NULL (which would required stddef.h).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31748 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
jrash
a69950df91 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31715
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31745 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
47a4652847 DOCS: Fix a few web page links in the documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
ccb01cc877 vo_gl: Make it possible to select GL_NEAREST scaling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31743 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
93336619b2 vo_gl: add helper macros to build the yuv conversion type number
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31742 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
7de77cdb11 gl_common.h: Add () around macro arguments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31741 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
4f15b55c9b vo_gl: Cosmetics: create luma texture first
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31740 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
5544c07aab cache: Use sigaction() instead of signal()
Signal() has an unavoidable race-condition on "broken by
backwards-compatibility" systems like Solaris. (Upon receiving a
signal, the handler is reset to SIG_DFL, thus a second signal will
kill the process. The problem could also be reduced by re-installing
the handler inside the handler, but there's still a race-condition and
the risk of the handler being called inside the handler).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31738 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
5ed772b9cd audio: support parameter changes (e.g. channel count) during playback
Add support for parameter changes (e.g. channel count) during playback.
This makes decoding AC3 files that switch between 2 and 6 channels
work reasonably well even with -channels 6 and ffac3 decoder.

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

Fix typo in error message: ACC -> AAC

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

Avoid printing AAC with SBR warning on every decode call, instead print
it only after every decoder reconfiguration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32476 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
6be6ba4094 commands: Allow fullscreen switching during -idle.
Useful in combination with -fixed-vo and a vo that can do rescaling
during "pause" like gl.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31736 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
a22c69b980 configure: use correct arguments in signal handler tests
Give signal handler function in test programs correct argument list.
This avoids a number of warnings from those test programs.
patch by Giorgio, mywing81 gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31735 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
c625cec1f8 osdep: Fix gettimeofday type to match the real one
Avoids issues if the system headers have a declaration for
gettimeofday but there's just no implementation there.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31733 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
f1773d911a ad_mpeg123: Enable robust resync
This prevents the decoder from giving up give after long pieces of invalid
data, for example during transmission errors with DVB-T and similar.

patch by Thomas Orgis, thomas-forum orgis org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31732 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
3f413403e8 configure: Move PIC test out of the x86 section
It is not only required on x86.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31729 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
c2e37e4346 manu.c: Remove unused static function menu_text_get_next_line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31727 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian
ef236e1fe2 ao_coreaudio: Improve handling of the "help" suboption
Avoid flagging it as an error and continue intialization if it is selected.

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

Reindent and align after r31725.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31726 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
8362b060d4 demux_ts: Improve subtitle support
Make it use the infrastructure for subtitle handling so e.g. switching
subtitles at runtime works and add support for PGS subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31724 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
Uoti Urpala
7d17b5e254 demuxer.c: add new_sh_sub_sid_lang
Allocates a new sh_sub and specifies language at the same time. I
don't think this is a particularly good API but add it for easier
compatibility with some svn changes.
2010-11-02 04:14:44 +02:00
diego
5b14a1b44f ao_coreaudio: Remove some unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31723 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
2c949a1c25 vo_tga: specify 15 bpp tga format endianness
15 bpp tga format is little endian.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31720 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
c2abfa3799 vo_tga: Use the proper imgfmt names
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31719 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
a7308d3546 vo_tag: fix RGB with alpha output on little-endian
Fix vo_tga RGB with alpha output on little-endian (blue and alpha were
swapped), and simplify by letting libswscale do everything, since it
nowadays supports alpha. This has the side-effect of actually
producing a useful alpha channel when one is encoded in the video.

Patch by Marton Balint [cus fazekas.hu]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31718 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian
4505a8f06a ao_coreaudio: Process the CoreFoundation runloop
Process it in case the vo doesn't do that, e.g. when vo_corevideo is
used with shared_buffer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31717 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian
2d35ff8332 ao_coreaudio: Refactor device selection
Add output device selection and correctly set the default device if
it's selected.

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

Fix cosmetics after r31715.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31716 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00