1
mirror of https://github.com/mpv-player/mpv synced 2024-11-11 00:15:33 +01:00
Commit Graph

33085 Commits

Author SHA1 Message Date
ib
ba160121ff etc/mplayer.desktop: revise desktop file
Revise desktop file.

Split Name entry into Name and GenericName entries.
This is according to the Desktop Entry Specification.

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

Revise desktop file.

Make slightly revised Catalan Name entry the GenericName entry.

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

Add German GenericName entry to desktop file and revise German Comment entry.

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

Make French and Italian Comment entries in desktop file GenericName entries.

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

Remove Spanish and Chinese Comment entries from desktop file.

There are no GenericName entries for Spanish and Chinese and
it's uncertain whether the Comment entries are OK.

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

Add X-GNOME-FullName entries to desktop file.

According to the Desktop Entry Specification, the "full name" should be built
from Name and GenericName. While some desktop environments do this (like KDE),
GNOME doesn't and uses its own key instead.

This closes Bugzilla #1680.

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

Add Japanese entries to desktop file.

Translation by committer.

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

Add Italian Comment entry to desktop file.

Translation by Giorgio Vazzana, mywing81 gmail com.

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

Add French Comment entry to desktop file.

Translation by Etienne Buira, etienne.buira free fr.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33548 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 09:28:04 +03:00
reimar
20ea5a1cfc vf_ilpack: fix incompatible function types
Do not call functions through a function pointer specifying more
arguments. It is theoretically possible to have calling models
where this would break horribly.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33536 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 09:24:31 +03:00
Uoti Urpala
3cbde4da84 cosmetics: vf_ilpack.c: tabs to 4 spaces 2011-07-06 09:23:53 +03:00
iive
b3f911f385 configure: add an initial check to verify compiler works at all
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33533 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 09:18:02 +03:00
reimar
be4d3d3491 vf_dint, vf_divtc: fix code assuming "char" is signed
Use int as type, there is no reason to use char which also
causes issues since it may be either signed or unsigned.

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

Fix code assuming that "char" is signed.

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

Fix code incorrectly assuming "char" is signed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33531 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 09:15:57 +03:00
iive
ab1544b74d cleanup: x11_common: remove pointless GC operations
Remove useless XSetBackground() call right before freeing the graphic
context.

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

Create empty vo_gc graphic context instead of one with
undefined foreground color.

The code that uses vo_gc already employs XSetForeground()/XSetBackground()
to change the context accordingly.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33525 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 09:10:56 +03:00
iive
15513a77fb vo_xv: avoid setting background color due to resize flicker
Set background color only when using ck-method=background. In the
other cases clearing of the non-video image area should be done
manually. Not drawing on the video image area prevents flickering
(visible when resizing).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33522 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 09:03:12 +03:00
iive
e00b1d7f7f stream_cue: Avoid probing empty filename in cue_find_bin()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33521 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 08:56:37 +03:00
reimar
d26f11deaf stream_cue: fix multiple bugs
Spelling fix.

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

Simplify: remove an unnecessary loop variable.

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

Add some "const".

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

Simplify NULL check.

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

Avoid crash if terminating " is missing.
Part of patch by Ivan Kalvachev [ikalvachev gmail com].

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

Fix 0-termination being placed one byte too far.
Part of patch by Ivan Kalvachev [ikalvachev gmail com].

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

Ensure 0-termination even if line does not start with FILE "
Part of patch by Ivan Kalvachev [ikalvachev gmail com].

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

Only accept regular files as .bin files for .cue files.
In particular avoids trying to use directories as .bin
when e.g. we failed to extract a filename.

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

Remove a duplicated open() call that could lead to a
file-descriptor leak in some cases.

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

Avoid possible crash if cue filename is very short.

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

Simplify by using av_strlcpy.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33520 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 08:54:49 +03:00
Uoti Urpala
47ccb48ac9 vo: avoid losing initial expose event
The x11_common.c window creation code could lose the initial expose
event due to input mask changes. This meant that the window might
not be cleared at start (there's a vo_x11_clearwindow() call but it
may do nothing if it runs before the window is mapped). Modify the
code to avoid losing the expose event. Handling that event should
ensure the window is cleared and otherwise set up properly.
2011-07-06 08:42:57 +03:00
Uoti Urpala
aeafa7a2b4 vo_xv: avoid clearing too much on resize
vo_xv set the "use_fs" parameter to vo_x11_clearwindow_part(). This
meant it always used the whole screen size to calculate the area to
clear. I can't see why overriding the vo->dwidth/dheight values would
ever be the right thing to do (if in fullscreen they should be set to
match that), so remove the use_fs parameter and always use the
dwidth/dheight values in the function. Also delete code drawing back
borders in vo_xv_draw colorkey. That should already happen in
vo_x11_clearwindow_part(); if it doesn't then things need to be fixed
anyway because colorkey code only ran in fullscreen mode (but borders
must work in window mode too).
2011-07-06 08:36:46 +03:00
reimar
48fdd3d926 vo_gl: Support 9- and 10-bit YUV input for OpenGL VOs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33502 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix clear/border color of chroma texture for 9- and 10-bit formats.
Avoids pink borders for those formats.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33504 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 07:31:54 +03:00
diego
94d3e6a710 cleanup: vo_direct3d: Mark a function static
This fixes the warning:
libvo/vo_direct3d.c:984:6: warning: no previous prototype for 'vo_draw_alpha_l8a8'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33499 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 07:24:52 +03:00
ib
f52b41600d demux_asf: Fix play duration calculation error
Acording to the ASF documentation, the play duration is zero
if the preroll value is greater than the play duration.

The new way of determining it (suggested by reimar) prevents
overflows as well.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33492 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 07:23:26 +03:00
cigaes
4f4fae851d vf_delogo: allow to change the rectangle based on the time
NOTE: the memory for the "file" argument will be leaked; dynamic
options are not automatically freed. Not fixing that now as I might
implement more general handling later. -uau

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33498 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 07:13:08 +03:00
Uoti Urpala
ecfffe6466 cosmetics: vf_delogo.c: remove tabs to allow direct merge
Remove tab characters to make the file match MPlayer 1 and thus allow
directly applying change from there.
2011-07-06 07:11:03 +03:00
ib
30d81cf726 cosmetics: asf.h: Fix comment error
According to the ASF documentation,
MF_PD_ASF_FILEPROPERTIES_PREROLL (preroll) is UINT64. Fix type
mentioned in comment.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33484 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 06:52:22 +03:00
Uoti Urpala
9298acdd60 options: free option defaults when freeing config
Possibly read-only default values of option variables are replaced
with dynamically allocated defaults when registering options. Free
these when freeing the overall config object on exit to clean up leak
report results.
2011-07-06 06:47:38 +03:00
Uoti Urpala
39e373aa8d options: allocate dynamic options with talloc
Allocate data structures for dynamic option values with talloc.
Hopefully there's no code left that tries to modify those dynamic
option values outside the option parser and relies on them being
malloc-allocated. Currently talloc functionality isn't used much and
the allocations are not hierarchical, so the main practical use for
now is just to allow very easy checking for memory leaks.
2011-07-06 06:47:26 +03:00
Uoti Urpala
a4166ac239 cleanup: remove useless set_codec_path() function
This function was left over from older logic to manipulate the
"codec_path" global variable. Now that variable is fully handled by
the general option system, so that the only effect of the function
was to introduce memory leaks in some circumstances. Delete the
useless function.
2011-07-06 06:37:22 +03:00
Uoti Urpala
1f6970b855 cleanup: reformat and clean up m_config.[ch]
m_config.c changes include removal of "#ifdef MP_DEBUG" from around
some assert lines.
2011-07-06 06:25:16 +03:00
cigaes
652a40e06b stream dump: print progress information
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33478 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-05 21:21:50 +03:00
Uoti Urpala
befed529bc debug output: reduce verbosity of some frequent messages
Drop from frequent (per-frame) messages from DBG2 to DBG3. Drop VDPAU
clock adjustment messages from V to DBG2.
2011-07-05 00:50:41 +03:00
Uoti Urpala
c8e78a0383 VO: silence "[ASPECT] Warning: No suitable new res found!"
The warning "[ASPECT] Warning: No suitable new res found!" was printed
from aspect() if the video ended up being downscaled from the original
size AND the horizontal direction was the more limiting one for
aspect-aware scaling. Also, because aspect() can run multiple times
when starting playback this warning could be output multiple times.
Change the code so that downscaling alone no longer triggers this
message.
2011-07-05 00:38:34 +03:00
Uoti Urpala
677e78f278 VO: clean up aspect.c, remove aspecttest tool
Clean up aspect.c code and simplify it somewhat (without changing the
overall logic). Replace debug output printf calls under #ifdef with
mp_msg() debug output (somewhat modified).

Remove the file aspecttest.c which created a binary to test aspect.c
functionality. It did not compile and would not be particularly useful
anyway. Remove some support lines from aspect.c and Makefile.
2011-07-05 00:30:13 +03:00
Uoti Urpala
8ff5b2b889 OSD: when switching sub/audio tracks show title of new track
If the played file has per-track titles for audio and subtitles show
those on the OSD when switching tracks. This changes the OSD message
from 'Audio: (2) eng' to 'Audio: (2) eng ("Director's commentary")'.
2011-07-03 20:41:46 +03:00
Uoti Urpala
c5364305be commands: change property mechanism to use talloc strings 2011-07-03 20:04:21 +03:00
Uoti Urpala
774bb252aa cosmetics: reformat demux_lavf.c, m_option.[ch] and m_property.c 2011-07-03 18:39:26 +03:00
Uoti Urpala
1a8384401b demux: use talloc for sh_* structs and "lang" field 2011-07-03 15:01:24 +03:00
Uoti Urpala
eb61456065 cleanup: reindent stheader.h
Also improve some comments and change two fields from int to bool.
2011-07-03 13:26:39 +03:00
Uoti Urpala
c8b3088c18 audio: move ready-for-ao data buffer from decoder to AO
Move the buffer storing audio data ready to be fed to the audio output
driver from the audio decoder object to the AO object. This will help
encoding code deal with end of input, and may also be useful to
improve other general gapless audio behavior (as AOs which do not
accept chunks smaller than a certain size may keep them in the buffer
while the decoder changes).

Less data may be dropped now when changing audio filters or switching
timeline parts.
2011-07-02 09:22:32 +03:00
Clément Bœsch
746f9b0040 Makefile: show brief build output by default 2011-07-02 02:11:33 +03:00
Clément Bœsch
af076c4055 Makefile: use $(RM) builtin 2011-07-02 01:58:34 +03:00
Clément Bœsch
480f3fb8d0 cleanup: fix mp_dbg() format string warnings 2011-07-01 03:37:34 +03:00
Uoti Urpala
48891debe2 cleanup: mark some vo_directfb2.c and vo_s3fb.c functions static 2011-06-29 11:43:19 +03:00
Uoti Urpala
a77e5f07ed Merge branch 'mplayer1_changes' 2011-06-29 11:39:06 +03:00
reimar
27b88a09c5 subreader: SAMI subs: wrap line if needed
Start a new line if there's no space left to append to the previous
one.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33471 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 11:28:46 +03:00
cehoyos
dc6fe9692b codecs.conf: add fourcc DVOO to rawyuy2
Digital Voodoo SD 8 Bit.
2011-06-29 11:13:05 +03:00
cehoyos
97dfc4f219 codecs.conf: add libavcodec r10k decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33462 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 11:11:50 +03:00
cehoyos
ede0eed089 demux_ts: Support S302M audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33461 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 11:11:50 +03:00
cehoyos
bd3ed7cf1f codecs.conf: add S302M audio codec from libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33460 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 11:11:36 +03:00
ib
96c992de47 stream.c: make some stream messages translatable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33454 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 11:01:31 +03:00
reimar
2c7488fe91 vo_gl: Request GL_LUMINANCE16 for 16-bit YUV input
Request GL_LUMINANCE16 as internal format for > 8 bit YUV formats.
Have yet to find a system that actually provides that though.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33453 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 10:49:52 +03:00
reimar
57f48fc1bf vo_gl: don't accept 9/10-bit formats as input
Make mp_get_chroma_shift() simpler/more generic and add an argument
to get the per-component bit depth.
Use this to check more properly for supported formats in
gl and gl2 vos (only 8 and 16 bit are supported, 9 and 10 are not).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33452 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 10:49:41 +03:00
vayne
f293935d39 Windows: stream_cddb.c: include <path.h> for MinGW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33449 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 10:27:16 +03:00
Uoti Urpala
9caae9b385 mp_msg: change mp_dbg() to inline function to check syntax
Change mp_dbg() from a macro that is defined to empty when MP_DEBUG is
unset to an inline function that has an empty body when MP_DEBUG is
unset. This allows the syntax of the calls to be checked even when
compiling without MP_DEBUG set.
2011-06-29 09:51:49 +03:00
reimar
8278977c0d cleanup: Make vcd_seek_to_track() static in more files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33436 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 09:26:00 +03:00
reimar
9149ec5d89 cache2.c: Avoid warnings about discarding volatile
In practice this should not really make a difference, but
the code is not significantly worse and it is more correct.

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33447 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 09:21:50 +03:00
reimar
00ffdc0da6 cleanup: some warning fixes and minor cleanups
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33399 b3059339-0415-0410-9bf9-f77b7e298cf2

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

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

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33426 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-06-29 09:17:19 +03:00
Uoti Urpala
4e1e23b2e9 input: clean up messages with button combination names
Previously messages that printed key/button names would have extra
names in button combinations appended after the main message,
resulting in output like:
No bind found for key 'MOUSE_BTN1'.-MOUSE_BTN3

Add a function that creates a complete combination name and use that
for all such messages. The above example changes to:
No bind found for key 'MOUSE_BTN1-MOUSE_BTN3'.

Other affected messages are a input.conf parsing error message and a
message about a bound command being invalid.
2011-06-29 08:54:15 +03:00