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

2869 Commits

Author SHA1 Message Date
Uoti Urpala
0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala
240550bbb9 Merge svn changes up to r30848 2010-03-10 03:00:14 +02:00
Uoti Urpala
e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala
5099b1458d Merge svn changes up to r30683 2010-03-10 00:52:17 +02:00
Uoti Urpala
13221a7165 Merge svn changes up to r30663
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala
8e593f5a34 Merge svn changes up to r30529 2010-03-09 22:47:41 +02:00
Uoti Urpala
5c6795a687 Merge svn changes up to r30494
Conflicts:
	libvo/vo_gl.c
	libvo/x11_common.c
2010-03-09 19:34:30 +02:00
Uoti Urpala
f1b6cdbe9d Merge svn changes up to r30484 2010-03-09 19:24:47 +02:00
Uoti Urpala
12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
Uoti Urpala
b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02:00
corey
39e9706f63 Document x264 VUI options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30868 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 06:27:54 +00:00
corey
22f233f531 Add a note about what x264's 'aud' parameter is for.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30867 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 06:23:33 +00:00
greg
ca7cbc0724 Enable ASS/SSA subtitle support in mencoder
Enable ASS/SSA rendering through libass in mencoder. This duplicates a
bit of code (to parse font attachments, for example). Additionally, add
a filter "fixpts" that generates PTS, simulating fixed fps. PTS
generated by this filter are then used for subtitle timing.

Original patch by Nicolas George. (nicolas.george normalesup.org)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 23:13:08 +00:00
jrash
4a6758e1fd sync with en/mplayer.1 rev. 30822
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30845 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 12:43:15 +00:00
reimar
90188f0e5f Add support for specifying window position relative to right and bottom
screen borders with -geometry.
Based on patch by Melchior FRANZ [melchior franz gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30822 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 20:57:56 +00:00
ptt
cb8796857c dots at end of sentences (kai driver section)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30748 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 17:07:22 +00:00
ptt
ba641b8275 synced to r30610
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30747 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 17:05:30 +00:00
ptt
2b2fbe120e new sentences on new lines, cropdetect filter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30746 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:47:42 +00:00
jrash
b3d891ebd7 sync with en/mplayer.1 rev. 30677
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30742 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 11:15:56 +00:00
reimar
aa0b21ab9f Explain that -mc 0 will need -noskip.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30677 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:53:11 +00:00
jrash
960908ffb2 sync with en/mplayer.1 rev. 30611
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30651 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-19 09:41:55 +00:00
corey
8438cc472d Document several new x264 parameters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30611 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 21:49:17 +00:00
corey
ab1a5a6306 Update x264 defaults listed in the man page.
x264 has changed the defaults for these parameters.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30610 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 21:45:53 +00:00
Gabrov
a5bb20514a synced with r30515
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30522 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-06 17:43:04 +00:00
jrash
d573ff0747 sync with en/mplayer.1 r30436
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30521 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-06 00:55:42 +00:00
Uoti Urpala
e187de88a1 vo_vdpau: make queuing future frame flips adjustable
Add -vo vdpau suboptions "queuetime_windowed" and "queuetime_fs" to
specify the maximum number of milliseconds how far into the future a
frame flip can be queued using the VDPAU presentation queue
functionality. The intended main use of these options is to allow
disabling use of the queuing feature on systems where using it causes
choppiness in other graphics behavior (this is an NVIDIA driver issue;
the video itself isn't affected).
2010-02-05 20:20:31 +02:00
cehoyos
eacccfafc8 Clarify -vo vdpau:pullup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30503 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-04 16:56:28 +00:00
reimar
3ffb8d5853 Document auto-detection of -vo gl:yuv=... value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30490 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-02 20:39:22 +00:00
reimar
92f21ea5cc Reword tfields documentation to reflect that it works mostly with MPlayer,
not just mencoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30482 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-01 18:20:22 +00:00
komh
f275d3d32c Add OS/2 KAI audio driver support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-01 14:09:53 +00:00
diego
b1ca7b2a66 Fix layout for the mouse/joystick controls sections.
hint by  KM, k.nxco.rp gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30475 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-31 10:29:29 +00:00
reimar
a81ed9c540 Document that -af-adv force=0 currently does the same as =1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30473 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-31 01:42:11 +00:00
jrash
d1e9785b70 sync with en/mplayer.1 r30436
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30453 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-29 13:54:20 +00:00
Uoti Urpala
6ece23f1b1 Merge svn changes up to r30437 2010-01-28 00:37:32 +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
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
Uoti Urpala
e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
Uoti Urpala
4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala
ff2df2ac54 Merge svn changes up to r30322 2010-01-25 15:17:50 +02:00
Uoti Urpala
47a04d40f3 Merge svn changes up to r30250 2010-01-25 14:34:56 +02:00
Gabrov
0d4517c688 typo fix, accidently reverted the new year patch with previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30416 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 03:19:47 +00:00
Gabrov
4d300c9056 synced with r30414
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30415 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 03:16:13 +00:00
Gabrov
e61e9b0b8a big new year patch for documentations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30414 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 03:15:18 +00:00
jrash
a281ccb094 sync with en/mplayer.1 r30336
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30392 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-22 23:53:15 +00:00
ptt
c2ba58aefc synced with r30336
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30375 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 18:02:44 +00:00
ptt
2ab8c5d481 synced with r30197
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30366 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-18 10:44:30 +00:00
reimar
d568153204 Document levelconv -vo gl suboption.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30336 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 20:03:35 +00:00
Gabrov
f7c5fa6a14 synced with r30311
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30316 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 10:48:23 +00:00
ptt
ec61df5d79 added a missing full stop
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30311 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 15:04:30 +00:00