Commit Graph
7853 Commits
Author SHA1 Message Date
Uoti Urpala 0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
compn 85d4dfe0ad remove outdated message about outfmt=i420
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27815 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-23 15:36:59 +00:00
diego 08ca24c62d Clarify screenw/screenh options, patch by Christian Ohm, chr.ohm gmx net.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27801 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 11:27:10 +00:00
gpoirier 9ea0b2eeb0 improve documentation of latest x264's options
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27800 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-18 21:11:44 +00:00
diego 392be5a106 misc updates for the Xvid, x264 and AAC sections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27776 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 23:20:10 +00:00
diego 07589781f4 Remove some pointless and/or outdated codec documentation sections.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27773 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 22:28:52 +00:00
diego aa16036d10 Remove section about containers. Its contents are non-informative, redundant,
outdated and generally not worth the trouble.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27771 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 21:41:25 +00:00
diego a65b36be9d Update VIDIX vs. svgalib documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27770 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 21:15:59 +00:00
gpoirier b60ab0c001 update x264's section with r999 of x264
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27768 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 09:31:19 +00:00
kraymer ef6c34c086 r27182: apply parameter name change of no-correct-pts from r26842 to man page
r27208: dvd:// streams accept the device path in the url; patch by Mathieu SCHROETER mathieu.schroeter gamesover ch 
r27230: Give all shell scripts a .sh suffix for consistency.
r27235: moved o option beetwen m* and p*
r27236: another alphabetical order correction
r27334: -border/-noborder are supported by gl/gl2, too, but only on Windows.
r27337: No idea which vos support -noborder how well, though those based on
        X11 or running on Windows _should_ work.
        Just remove that line for now.
r27342: Remove outdated "X11 only" from xineramascreen option and try to make clearer
        what it does and what it does not.
r27348: add list of supported vo's to -xineramascreen


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27729 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-08 16:22:23 +00:00
gpoirier d239eb53ae sync w/r27691
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27725 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-06 14:09:22 +00:00
Gabrov 83b02d5706 synced with r27718
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27719 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-05 13:43:45 +00:00
diego c378cd84be vo_fbdev now supports -geometry.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27691 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-03 21:55:05 +00:00
diego 1b697bc8d6 whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27690 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-03 21:54:21 +00:00
Uoti Urpala e7a611de00 Merge svn changes up to r27688 2008-10-03 18:05:21 +03:00
gpoirier ded93e5b05 fix FAQ about compiling 32 bit mplayer on x86_64
Suggested by Wolfgang Knauf


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27683 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-02 22:15:45 +00:00
Uoti Urpala ebb4abf208 Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.

Conflicts:
	command.c
	mplayer.c
2008-10-02 05:17:23 +03:00
Uoti Urpala 20571d6f68 Revert "add outdir sub-option to vo png"
This reverts commit 22322409dd.

The reverted commit had at least the following problems:
- It adds a lot of filesystem handling code to an individual VO.
- The added code is duplicated from vo_jpeg.c.
- The added code has exit_player() calls. A VO should not exit the
  whole program. Even if vo_jpeg still has those calls they are a bug
  that shouldn't spread elsewhere.
- The functionality benefit of automatic directory creation is
  questionable. It was probably only included in vo_jpeg because of
  the option to automatically create multiple subdirectories (though
  the utility of that is also questionable); vo_png does not have that.
2008-10-02 05:15:35 +03:00
reimar 52ef7eb263 Add a "pause" property to allow checking if MPlayer is paused.
Behaviour without pausing_keep_force prefix is a bit weird.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27680 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-01 17:05:30 +00:00
gpoirier fe1d9e57cd sync w/r27651
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27676 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-30 19:35:10 +00:00
gpoirier f938a38b72 sync w/r27607
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27674 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-29 20:44:38 +00:00
nicodvb 20e4a74eb5 slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27667 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-26 21:17:01 +00:00
reimar 97cf6acdab Add an experimental pausing_keep_force slave mode command prefix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27665 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-25 17:40:33 +00:00
diego 48480b3ce7 misc fixes for the GUI section
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27663 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-25 06:51:42 +00:00
compn 22dc2cd88e typo fix spotted by diego
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27651 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 17:08:21 +00:00
Uoti Urpala 849dc0ba31 Merge svn changes up to r27649
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
2008-09-20 16:13:33 +03:00
ben 22322409dd add outdir sub-option to vo png
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27650 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-20 13:13:02 +00:00
compn 26b6a16cd5 add windows NUL info
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27640 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-19 18:20:31 +00:00
compn b22ef372e3 document lavc/lavf avoption o suboption
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27639 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-19 18:02:16 +00:00
compn 8b32526cbf add lavfopts matroska suboption
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27638 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-18 19:07:33 +00:00
Gabrov d3e9ce8d24 synced with r27607
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27608 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-14 16:10:04 +00:00
diego 196f2d99c6 wording consistency cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27607 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-14 10:22:27 +00:00
reimar c05694a3b4 Make -heartbeat-cmd and -stop-xscreensaver sections reference each other.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27606 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-14 10:17:30 +00:00
compn 5f97d37455 multiple locales in mplayer wish
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27598 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-13 03:28:15 +00:00
Uoti Urpala 259ea9d703 Merge svn changes up to r27573
Conflicts:
	libmpcodecs/vd_ffmpeg.c
2008-09-10 23:59:08 +03:00
gpoirier 05b00652e7 sync w/r26990 and wording fixes, patch by Cédric Viou
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27572 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-10 20:05:32 +00:00
gpoirier be853d1b77 wording fixes by Cédric Viou
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27571 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-10 20:02:29 +00:00
gpoirier 6d5e3fe12f typography and wording fixes, by Cédric Viou and myself
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27570 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-10 19:57:06 +00:00
gpoirier 593bf6af8e more French typography fixes and wording fixes, by Cédric Viou and myself
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27560 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 21:07:26 +00:00
gpoirier 579237def2 lots of fixes, original patch by Cédric Viou
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27559 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 20:51:22 +00:00
diego 3dbdb9db10 'mp3lame' audio output codec was wrongly listed as 'lame'.
noticed by Robert Vincenz, vincenz.robert t-online de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27542 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 14:32:15 +00:00
Uoti Urpala b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
ptt b5ddaf20ba synced with r27454
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27488 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-27 11:07:15 +00:00
gpoirier d9249395c4 sync w/r27466
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27468 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-15 19:48:09 +00:00
michael a42593f347 Document -lavcopts o, aka libavcodec AVOption.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27466 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-15 11:40:01 +00:00
Uoti Urpala e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
ben e73396900c Mention IVTV, S3 and SH_VEU drivers within VIDIX section of manpage.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27454 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:15:24 +00:00
gpoirier f14367fac9 sync w/r27348, patch by JRaSH
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27450 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 21:10:04 +00:00
gpoirier 0bd41be67f sync w/27407 + fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27446 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-09 18:40:51 +00:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00