Mercurial > mplayer.hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 13494: (0) -10000 -3000 -1000 -448 +448 +1000 +3000 +10000 tip
age author description
Mon, 27 Sep 2004 19:18:45 +0000 diego identical text for identical suboptions
Mon, 27 Sep 2004 19:09:43 +0000 gpoirier I need Cola! -vf=eq2=1.0:-0.8 is the syntax for conf file, -vf eq2=1.0:-0.8 is
Mon, 27 Sep 2004 19:03:49 +0000 gpoirier Sws default setting correction, and random wordings
Mon, 27 Sep 2004 18:13:23 +0000 diego MEncoder-users mailing list created.
Mon, 27 Sep 2004 18:12:54 +0000 diego Porting of CRTC2 to mga_vid is stalled.
Mon, 27 Sep 2004 10:08:57 +0000 michael compensate for width/height being picture width/height instead of bitstream width/height
Mon, 27 Sep 2004 10:07:49 +0000 paszczi synced with 1.749 + random fixes
Mon, 27 Sep 2004 09:21:38 +0000 gpoirier Better phrasing suggested by The Wanderer
Mon, 27 Sep 2004 08:33:17 +0000 gpoirier Tons of French corrections
Mon, 27 Sep 2004 02:11:24 +0000 rfelker SBR code does NOT work with fixed point (uses floats, slow as hell)
Sun, 26 Sep 2004 21:41:54 +0000 gpoirier Sync with 1.748: better descriptions for remaining, poorly documented masking
Sun, 26 Sep 2004 19:04:01 +0000 nauj27 sync with 1.685
Sun, 26 Sep 2004 19:03:19 +0000 gpoirier better descriptions for remaining, poorly documented masking options.
Sun, 26 Sep 2004 19:01:11 +0000 gpoirier Cumulative sync patch:
Sun, 26 Sep 2004 15:10:47 +0000 faust3 use aspect code when used with vidix
Sun, 26 Sep 2004 14:58:57 +0000 diego man page review part X
Sun, 26 Sep 2004 14:49:33 +0000 faust3 detect byte order even for cross-compiling
Sun, 26 Sep 2004 14:40:59 +0000 faust3 --host-cc option for crosscompiling
Sun, 26 Sep 2004 14:03:51 +0000 michael -lavdopts lowres
Sun, 26 Sep 2004 12:59:18 +0000 diego Look for SDL includes in /usr/include as well, use cc instead of gcc.
Sun, 26 Sep 2004 12:57:53 +0000 diego Wrong comment, the bitmap is blue, not green.
Sun, 26 Sep 2004 12:54:00 +0000 michael low resolution decoding
Sun, 26 Sep 2004 10:21:17 +0000 gpoirier Encoding tip regarding x264's deblock filter suggested by Loren Merritt.
Sun, 26 Sep 2004 10:01:13 +0000 gpoirier Cumulative sync with 1.744
Sun, 26 Sep 2004 09:54:46 +0000 diego -lpthread --> $(ARCH_LIB), helps linking on systems without pthread.
Sat, 25 Sep 2004 23:23:23 +0000 diego quantizer --> quantization as pointed out by Attila
Sat, 25 Sep 2004 22:58:59 +0000 diego Hint at examples, better wording, some cosmetics.
Sat, 25 Sep 2004 22:18:41 +0000 diego printf --> mp_msg conversion in ao_plugin
Sat, 25 Sep 2004 21:02:49 +0000 paszczi synced with 1.742
Sat, 25 Sep 2004 19:32:46 +0000 nauj27 almost sync :)
Sat, 25 Sep 2004 17:08:01 +0000 gpoirier Sync with 1.742
Sat, 25 Sep 2004 17:05:04 +0000 gpoirier Better vme description
Sat, 25 Sep 2004 16:10:55 +0000 diego printf --> mp_msg transition in vo_yuv4mpeg
Sat, 25 Sep 2004 15:48:25 +0000 faust3 add ao_dsound author
Sat, 25 Sep 2004 15:34:42 +0000 faust3 directsound audio output plugin, patch by Gabor Szecsi <deje at miki.hu> some minor modifications by me
Sat, 25 Sep 2004 13:46:21 +0000 syrjala Fixed [no]input suboptions.
Sat, 25 Sep 2004 10:11:16 +0000 paszczi synced with 1.49
Sat, 25 Sep 2004 10:09:52 +0000 paszczi synced with 1.741
Sat, 25 Sep 2004 09:43:57 +0000 gpoirier Better x264 descriptions/fixes based on Loren Merritt's patch (Thu, 23 Sep 2004)
Fri, 24 Sep 2004 20:53:01 +0000 diego DirectX 7 or later is needed for -vo directx.
Fri, 24 Sep 2004 19:20:46 +0000 diego FAAD updated by adland.
Fri, 24 Sep 2004 17:31:36 +0000 diego Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12.
Fri, 24 Sep 2004 17:03:03 +0000 ivo Same wording of vo_jpeg's outdir option as vo_pnm's.
Fri, 24 Sep 2004 09:55:57 +0000 diego sync by Jiri Heryan <technik@domotech.cz>
Thu, 23 Sep 2004 23:01:48 +0000 rathann missing extern
Thu, 23 Sep 2004 22:23:16 +0000 paszczi synced with 1.739
Thu, 23 Sep 2004 20:16:13 +0000 diego roff fixes
Thu, 23 Sep 2004 18:43:31 +0000 gpoirier sync with 1.738 and fixes
Thu, 23 Sep 2004 18:42:16 +0000 gpoirier Encoding tips for x264 + 10l
Thu, 23 Sep 2004 10:43:32 +0000 diego Rroff markup fixes and point out a 10l.
Thu, 23 Sep 2004 10:42:13 +0000 diego roff markup fix
Thu, 23 Sep 2004 10:06:37 +0000 reimar fix examples for ao_alsa options dialog and add example for mixer index.
Thu, 23 Sep 2004 07:11:29 +0000 danny Synced with 1.737
Wed, 22 Sep 2004 22:35:41 +0000 paszczi synced with 1.738 + small fixes
Wed, 22 Sep 2004 18:56:50 +0000 rtognimp Add comment to remind that voxmsdec.ax requires also msms001.vwp
Wed, 22 Sep 2004 17:43:39 +0000 diego small fixes
Wed, 22 Sep 2004 16:26:53 +0000 faust3 100l
Wed, 22 Sep 2004 15:52:44 +0000 gpoirier Cumulative patch
Wed, 22 Sep 2004 15:03:13 +0000 gpoirier Better lumi/dark_masking descriptions, tips for 4mv and autoaspect and 10l fix
Wed, 22 Sep 2004 14:29:08 +0000 gpoirier Better nssew description
Wed, 22 Sep 2004 14:12:53 +0000 reimar allow to select an alsa mixer channel index.
Wed, 22 Sep 2004 11:30:33 +0000 gpoirier Sync with 1.733: add support for subpel quality refinement option in x264.
Wed, 22 Sep 2004 11:25:26 +0000 gpoirier fixes, better wordings on the new portable anymap and md5sum video output
Wed, 22 Sep 2004 10:26:22 +0000 iive add support for subpel quality refinement option in x264.
Wed, 22 Sep 2004 04:43:15 +0000 rfelker 10l
Wed, 22 Sep 2004 00:34:55 +0000 diego Nobody maintains dvdnav, it's not supported.
Tue, 21 Sep 2004 20:35:22 +0000 gpoirier sync with 1.732: encoding to mp2 with libtoolame
Tue, 21 Sep 2004 20:34:47 +0000 reimar setting samplesize to 2 in decoders where neccessary.
Tue, 21 Sep 2004 19:50:54 +0000 nicodvb encoding to mp2 with libtoolame
Tue, 21 Sep 2004 19:43:37 +0000 nicodvb encoding to mp2 with libtoolame - only cbr atm
Tue, 21 Sep 2004 18:02:33 +0000 mosu With the latest change to dec_audio.c (1.32) the demuxers have to set sh_a->samplesize to something != 0.
Tue, 21 Sep 2004 17:23:49 +0000 alex lot of bigendian fixes
Tue, 21 Sep 2004 16:59:53 +0000 diego credit for Loren Merritt, patch by himself
Tue, 21 Sep 2004 13:38:19 +0000 diego clarification about FFmpeg license, typo
Tue, 21 Sep 2004 12:47:50 +0000 gpoirier Sync with 1.731: Better description of lavc's dia encoding option, thanks
Tue, 21 Sep 2004 12:12:58 +0000 diego Better explain why we have no DVD menus and what to do about it (DIY).
Tue, 21 Sep 2004 12:10:40 +0000 diego typo, Xine --> xine
Tue, 21 Sep 2004 11:58:42 +0000 gpoirier Better description of lavc's dia encoding option, thanks to Loren Merritt
Tue, 21 Sep 2004 10:07:14 +0000 gpoirier Fixes suggested by Diego
Tue, 21 Sep 2004 09:42:33 +0000 gpoirier Cumulative patch 1.727 and 1.722
Tue, 21 Sep 2004 08:39:12 +0000 diego split patches up as far as sensibly possible, but no further.
Tue, 21 Sep 2004 08:30:36 +0000 diego typo
Tue, 21 Sep 2004 08:28:24 +0000 diego Cosmetics, start new sentences on a new line.
Tue, 21 Sep 2004 08:20:28 +0000 diego Roff interprets ' as markup, thus lines should never start with '.
Tue, 21 Sep 2004 08:10:02 +0000 diego sync by Jiri Heryan <technik at domotech dot cz>
Mon, 20 Sep 2004 23:15:10 +0000 paszczi cosmetics
Mon, 20 Sep 2004 22:43:26 +0000 paszczi synced with 1.728 + random fixes
Mon, 20 Sep 2004 20:55:28 +0000 gpoirier Reworked description of lavc's 3-pass encoding; patch by its creator
Mon, 20 Sep 2004 20:07:29 +0000 gpoirier 10l: Make turbo mode compatible with 3-pass encoding
Mon, 20 Sep 2004 18:39:48 +0000 gpoirier Better description of Loren Merritt's 3-pass mode, better qns desc., and a
Mon, 20 Sep 2004 14:26:57 +0000 ivo Added the uCIFS library, of which a part is used by vo_md5sum.
Mon, 20 Sep 2004 08:54:36 +0000 gpoirier "partial" sync with 1.726: Document the new portable anymap and md5sum video
Mon, 20 Sep 2004 08:48:53 +0000 al Don't output error when testing for JACK. Also _insist_ on a JACK version
Mon, 20 Sep 2004 04:26:41 +0000 ivo Credit where credit's due :)
Mon, 20 Sep 2004 01:56:20 +0000 ivo Document the new portable anymap and md5sum video output drivers.
Mon, 20 Sep 2004 01:51:30 +0000 ivo Added myself to AUTHORS and MAINTAINERS for the new vo_pnm and vo_md5sum
Mon, 20 Sep 2004 01:35:43 +0000 ivo This patch enables the compilation and linking of vo_md5sum to libvo.
Mon, 20 Sep 2004 01:31:26 +0000 ivo This patch enables the compilation and linking of vo_pnm (the portable
Mon, 20 Sep 2004 01:28:32 +0000 ivo New translatable messages for vo_pnm (the portable anymap video output
Mon, 20 Sep 2004 01:01:08 +0000 ivo New MD5 sum video output driver. For every frame, it calculates the MD5 sum
Mon, 20 Sep 2004 00:54:57 +0000 ivo New generic 'portable anymap' video output driver. It supports portable
Sun, 19 Sep 2004 22:15:57 +0000 michael 100l typo
Sun, 19 Sep 2004 19:33:56 +0000 gpoirier Sync with 1.725: Better wording and clarity as suggested by the Wanderer.
Sun, 19 Sep 2004 18:45:11 +0000 faust3 handle sigchld in mplayer.c
Sun, 19 Sep 2004 18:36:18 +0000 faust3 switch_ratio may not work with some filter chains
Sun, 19 Sep 2004 10:58:41 +0000 diego Better wording and clarity as suggested by the Wanderer.
Sun, 19 Sep 2004 10:51:33 +0000 paszczi cosmetics by frogu
Sun, 19 Sep 2004 10:17:07 +0000 gpoirier Fixes indentation around my contributions, and adds lavc's "turbo" mode,
Sun, 19 Sep 2004 09:59:05 +0000 gpoirier New lavc flag: "turbo" mode which is supposed to speed up 2-pass encoding
Sat, 18 Sep 2004 23:20:09 +0000 michael support generating divx2pass.log on 2nd pass patch by (Loren Merritt <lorenm at u dot washington dot edu>)
Sat, 18 Sep 2004 21:46:41 +0000 paszczi synced with 1.723
Sat, 18 Sep 2004 20:31:28 +0000 ivo mp_msg transition of unmaintained audio output drivers.
Sat, 18 Sep 2004 18:14:25 +0000 gpoirier Cumulative patch:
Sat, 18 Sep 2004 14:35:19 +0000 reimar fix playback of files with displaysize not set (aspect was set to NaN for these)
Sat, 18 Sep 2004 14:20:14 +0000 diego Use the same names as on mphq for the generated man pages.
Sat, 18 Sep 2004 14:17:45 +0000 diego Reduce excessive verbosity a bit.
Sat, 18 Sep 2004 13:57:46 +0000 diego man page review part IX
Sat, 18 Sep 2004 12:58:45 +0000 diego czech man page translation by Jiri Heryan <technik at domotech dot cz>
Sat, 18 Sep 2004 10:10:58 +0000 gabucino compile fix
Sat, 18 Sep 2004 09:10:47 +0000 reimar force compilers not to optimize/inline extend_stack_for_dll_alloca
Sat, 18 Sep 2004 04:20:13 +0000 rfelker fix reimar's 10l...no actually imho it's arpi's 100l for writing the
Sat, 18 Sep 2004 00:08:17 +0000 michael passing an array or double precission parameters for the scaling function, instead of missusing a few bits of the flags
Fri, 17 Sep 2004 21:15:52 +0000 paszczi synced with 1.40 + random fixes
Fri, 17 Sep 2004 21:10:02 +0000 nauj27 A bit of sync
Fri, 17 Sep 2004 20:12:44 +0000 paszczi synced with 1.721
Fri, 17 Sep 2004 17:11:29 +0000 gpoirier Sync with English manpage
Fri, 17 Sep 2004 15:53:04 +0000 diego -menu-startup, based on patch by Aurelien Jacobs <aurel at gnuage dot org>
Fri, 17 Sep 2004 15:38:59 +0000 diego runtime aspect switching, patch by Aurelien Jacobs <aurel at gnuage . org>
Fri, 17 Sep 2004 15:35:47 +0000 diego Quit now sends an optional return value, based on patch sent by Aurelien
Fri, 17 Sep 2004 12:16:42 +0000 diego Translate up to MSGL_STATUS so all normal output is translated.
Fri, 17 Sep 2004 11:34:00 +0000 diego MicroDVD IS a frame-based subtitle format, mistake noticed by Jiri Heryan
Fri, 17 Sep 2004 11:30:30 +0000 diego wording, spelling and small fixes to the video output driver section
Fri, 17 Sep 2004 11:18:55 +0000 diego Made the wording of MSGTR_EdlCantOpenForWrite and MSGTR_EdlCantOpenForWrite
Fri, 17 Sep 2004 10:37:56 +0000 faust3 10l
Fri, 17 Sep 2004 09:56:09 +0000 faust3 center the image when screenw & height are set
Fri, 17 Sep 2004 09:55:50 +0000 kraymer lastes sync with EDL messages
Fri, 17 Sep 2004 02:28:44 +0000 diego Hardcoded EDL messages moved to help_mp-en.h, Doxygen comments added, patch
Thu, 16 Sep 2004 19:51:13 +0000 reimar moved sh_audio initialization from dec_audio to demuxer.c to fix
Thu, 16 Sep 2004 19:42:54 +0000 rtognimp IBM Ultimotion native decoding via libavcodec
Thu, 16 Sep 2004 18:08:17 +0000 faust3 Changed the default again so that the initial video position is in
Thu, 16 Sep 2004 11:00:37 +0000 diego nick
Thu, 16 Sep 2004 09:25:56 +0000 faust3 make it possible to use the run command from a menu config file, based on a patch by Aurelien Jacobs <aurel@gnuage.org>
Thu, 16 Sep 2004 08:12:05 +0000 faust3 stdout and stderr are macros --- you can't assign to them. Assignment doesn't make sense anyway, because freopen will always return the same FILE * structure that it got in parameter. patch by Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Thu, 16 Sep 2004 07:58:19 +0000 faust3 declare modify_ldt with syscall3 macro for older glibcs patch by Mikulas Patocka <mikulas at artax.karlin.mff.cuni.cz>
Wed, 15 Sep 2004 21:58:21 +0000 rtognimp Support "Creative ADPCM codec" and "Micronas speech codec" audio codecs
Wed, 15 Sep 2004 16:01:34 +0000 faust3 Depend on bio2jack v0.3 as it fixes an important bug in JACK_Write() function patch by ismail donmez <kde@myrealbox.com>
Wed, 15 Sep 2004 15:33:52 +0000 paszczi synced with 1.718
Wed, 15 Sep 2004 15:17:06 +0000 faust3 mingw compile fix
Wed, 15 Sep 2004 14:19:41 +0000 faust3 fix not matching prototype, patch by Mikulas Patocka <mikulas at artax.karlin.mff.cuni.cz>; remove ^M
Wed, 15 Sep 2004 14:08:46 +0000 faust3 fix a memory corruption and make sure only getch2 handles stdin
Wed, 15 Sep 2004 13:37:49 +0000 faust3 option to display menu at startup, patch by Aurelien Jacobs <aurel at gnuage.org>
Wed, 15 Sep 2004 13:16:52 +0000 faust3 This time is a patch to improve subtitle alignment management. It
Wed, 15 Sep 2004 13:08:53 +0000 gpoirier Cumulative patch:
Wed, 15 Sep 2004 11:26:45 +0000 faust3 fix ineffectual video equalizer command line options, patch by kiriuja <mplayer-bugs at en-directo.net>, closes #37, some more variable docu by me
Wed, 15 Sep 2004 10:47:03 +0000 danny Audio output driver suboptions documented
Wed, 15 Sep 2004 09:45:34 +0000 faust3 slave mode command to switch aspect ratio, patch by Aurelien Jacobs <aurel at gnuage.org>
Wed, 15 Sep 2004 09:29:10 +0000 faust3 quit slave mode command now accepts an exit value, patch by Aurelien Jacobs <aurel at gnuage.org>
Wed, 15 Sep 2004 08:02:51 +0000 faust3 add a comment to the Xorg workaround
Tue, 14 Sep 2004 21:02:19 +0000 rtognimp Index must be positive to prevent endless loop on bad data
Tue, 14 Sep 2004 20:43:39 +0000 faust3 workaround for Xorg-6.8 not saving the surface registers on bigendian
Tue, 14 Sep 2004 16:57:37 +0000 iive fix compile on gcc 2.95.3
Mon, 13 Sep 2004 21:21:48 +0000 rtognimp AVC support moved to libavcodec, avcC atom is now passed in extradata
Mon, 13 Sep 2004 15:24:02 +0000 wight sync 1.717
Sun, 12 Sep 2004 22:44:49 +0000 wight random fixes, spelling, vocabulary
Sun, 12 Sep 2004 22:43:17 +0000 wight Consistency fixes, spelling
Sun, 12 Sep 2004 18:51:44 +0000 gpoirier Sync with English mp-v1.715.
Sun, 12 Sep 2004 18:42:02 +0000 danny All video driver suboptions documented, gif and tga examples
Sun, 12 Sep 2004 16:42:26 +0000 diego small fixes
Sun, 12 Sep 2004 15:45:49 +0000 kraymer changed wording (s/Unteroption/Suboption)
Sun, 12 Sep 2004 15:36:43 +0000 iive 2pass encoding support for x264(r46).
Sun, 12 Sep 2004 14:01:13 +0000 mosu Spelling. Patch by Jan Minar <jjminar at fastmail onedot fm>.
Sun, 12 Sep 2004 10:57:51 +0000 gpoirier Sync with 1.711:
Sun, 12 Sep 2004 01:35:41 +0000 ivo Added one more error check. Forgot it last time (grrr :) ).
Sat, 11 Sep 2004 22:54:33 +0000 kraymer removed occurence of work as maintainer (in regard to Diego's email)
Sat, 11 Sep 2004 22:52:34 +0000 kraymer updates in video output drivers section (update rev 1710 of en/mplayer.1)\nother minor fixes
Sat, 11 Sep 2004 22:50:00 +0000 kraymer hopefully last format correction regarding prior commit in video output drivers section
Sat, 11 Sep 2004 22:37:35 +0000 kraymer fixes some typos, wording and formatting
Sat, 11 Sep 2004 21:15:13 +0000 ivo Fixed typo.
Sat, 11 Sep 2004 19:59:31 +0000 ivo * Changed malloc and strncpy to strdup. Less code.
Sat, 11 Sep 2004 19:48:00 +0000 kraymer added myself to AUTHORS file
Sat, 11 Sep 2004 19:47:16 +0000 kraymer changed email address
Sat, 11 Sep 2004 19:18:19 +0000 kraymer minor changes I came across during sync of videofilters section
Sat, 11 Sep 2004 19:15:48 +0000 kraymer spell-checking done for beginning until player-specific options (mplayer only)
Sat, 11 Sep 2004 13:08:34 +0000 diego Make --with-x264incdir work, patch by Jan Knutar <jknutar at nic.fi>
Sat, 11 Sep 2004 09:40:34 +0000 reimar fix seeking in audio-only case (crash when seeking backwards, time reset to 0)
Sat, 11 Sep 2004 09:28:39 +0000 danny Video driver null, yuv4mpeg, gif89a, pgm, png and tga documented, jpeg drop from the list to document
Sat, 11 Sep 2004 09:18:07 +0000 alex info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
Sat, 11 Sep 2004 09:07:07 +0000 reimar output faad error message in case of a decoder error
Fri, 10 Sep 2004 22:22:02 +0000 rtognimp 100l
Fri, 10 Sep 2004 20:53:22 +0000 al Don't prepend basepath to a full unix path. ( 10l to Joey. )
Fri, 10 Sep 2004 17:54:17 +0000 diego libavformat
Fri, 10 Sep 2004 16:39:31 +0000 rtognimp Fixes for VirtualAlloc function:
Fri, 10 Sep 2004 10:15:50 +0000 diego typos, wording
Fri, 10 Sep 2004 02:07:16 +0000 rfelker show video format for all demuxers, not just avi (move this somewhere else if you prefer)
Fri, 10 Sep 2004 01:15:24 +0000 ivo Removed unused variable (leftover of having two instances of directory creation
Thu, 09 Sep 2004 19:28:54 +0000 reimar avoid always skipping first junk with a "sync lost" message
Thu, 09 Sep 2004 19:24:12 +0000 rtognimp Don't leave a messed up terminal after a crash
Thu, 09 Sep 2004 18:36:15 +0000 gpoirier typos and wordings picked up by Diego
Thu, 09 Sep 2004 15:36:47 +0000 gpoirier Sync with 1.709: "some typo, case change"
Thu, 09 Sep 2004 15:25:06 +0000 gpoirier Encoding options update, most are XviD related
Thu, 09 Sep 2004 13:33:40 +0000 paszczi sync
Thu, 09 Sep 2004 12:53:30 +0000 danny some typo, case change
Thu, 09 Sep 2004 12:22:27 +0000 paszczi synced with 1.708 (aka first sync from my laptop;P)
Thu, 09 Sep 2004 10:33:36 +0000 gpoirier All video filters are now documented and in sync against English man page.
Thu, 09 Sep 2004 01:13:26 +0000 attila adding the code documentation guide lines
Wed, 08 Sep 2004 23:44:34 +0000 diego chunk size fix from Ross Finlayson, ported from xine
Wed, 08 Sep 2004 15:31:47 +0000 diego CVS policy updated as discussed on dev-eng.
Wed, 08 Sep 2004 14:58:28 +0000 diego Von/van should not determine alphabetical order, email address added.
Wed, 08 Sep 2004 11:49:39 +0000 gpoirier Typos on the XviD section
Wed, 08 Sep 2004 09:42:05 +0000 danny Synced with 1.707
Wed, 08 Sep 2004 03:51:37 +0000 ivo Renamed some MSGTR_VO_JPEG_* messages to MSGTR_VO_* messages, so they can
Wed, 08 Sep 2004 01:11:16 +0000 ivo This patch moves the directory creation code to a separate function. I have
Tue, 07 Sep 2004 20:27:05 +0000 gpoirier Big changes on XviD documentation.
Tue, 07 Sep 2004 17:30:07 +0000 diego OpenBSD clarification by Bj¸«Órn Sandell <biorn @ dce . chalmers . se>
Tue, 07 Sep 2004 11:00:27 +0000 kraymer newly created videofilters section
Tue, 07 Sep 2004 10:40:30 +0000 kraymer finished translation and review of decoding/filtering section
Tue, 07 Sep 2004 10:23:27 +0000 kraymer \-af note added
Tue, 07 Sep 2004 09:59:27 +0000 gpoirier Cumulative patch
Tue, 07 Sep 2004 08:53:09 +0000 gpoirier Sync with Diego's alphabetical order for lavdopts
Tue, 07 Sep 2004 01:20:19 +0000 michael disable direct rendering for h264
Tue, 07 Sep 2004 01:05:56 +0000 diego MPlayer X11 options do not affect SDL.
Tue, 07 Sep 2004 00:56:58 +0000 diego spelling
Mon, 06 Sep 2004 23:07:20 +0000 kraymer reorder lavdopts suboptions to achieve alphabetical order
Mon, 06 Sep 2004 22:54:06 +0000 kraymer \-jpeg moved
Mon, 06 Sep 2004 22:30:53 +0000 rfelker finally diego will be happy....this is totally useless but oh well :)
Mon, 06 Sep 2004 22:27:08 +0000 ivo mplayer -af help now lists all available audio filters.
Mon, 06 Sep 2004 21:26:46 +0000 reimar do not modify d_width and d_height when -xy option was given, otherwise -xy has no effect with e.g. vo_gl
Mon, 06 Sep 2004 21:25:59 +0000 rfelker pullup docs + new feature for slow cpus :)
Mon, 06 Sep 2004 20:11:37 +0000 reimar Copy-n-Paste bug breaking channel selection in audio configuration dialog
Mon, 06 Sep 2004 14:07:48 +0000 diego typo
Mon, 06 Sep 2004 14:06:33 +0000 diego pan filter needs number of _input_ channels, ported from the man page.
Mon, 06 Sep 2004 14:05:09 +0000 diego List administrators.
Mon, 06 Sep 2004 11:11:02 +0000 diego mailing lists and german documentation maintainers, spelling
Mon, 06 Sep 2004 11:03:51 +0000 diego -lavdopts fast, small fix to -lavdopts ec
Mon, 06 Sep 2004 10:55:01 +0000 diego alphabetical order for lavdopts
Mon, 06 Sep 2004 10:50:19 +0000 diego MB, QP explanation, some more consistency
Mon, 06 Sep 2004 09:05:38 +0000 diego some new patch policy: compression, mail threading, printf vs mp_msg
Mon, 06 Sep 2004 07:52:49 +0000 gpoirier More information on XviD's "interlaced" and "4mv" options thanks to a
Sun, 05 Sep 2004 22:10:59 +0000 rfelker fix seeking with -hr-mp3-seek. maybe not the best fix (why is last_pts
Sun, 05 Sep 2004 22:01:23 +0000 kraymer Sorry, typo
Sun, 05 Sep 2004 21:56:39 +0000 kraymer sync to latest updates in vo_jpeg.c section
Sun, 05 Sep 2004 20:55:10 +0000 gpoirier Pretty much all filters documented and in sync now (up to "phase" filter,
Sun, 05 Sep 2004 17:54:09 +0000 ivo Some minor vo_jpeg fixes:
Sun, 05 Sep 2004 17:46:33 +0000 joey fixed --enable-gif bug
Sun, 05 Sep 2004 16:55:06 +0000 rfelker fixed warning in my patch
Sun, 05 Sep 2004 16:51:15 +0000 rfelker ensure that avi files have a valid header as soon as possible.
Sun, 05 Sep 2004 13:02:31 +0000 gpoirier updates -vo jpeg:options and minor sync
Sat, 04 Sep 2004 22:59:33 +0000 ivo Removal of -jpeg commandline option.
Sat, 04 Sep 2004 15:34:20 +0000 reimar alignment for SPARC64, second try
Sat, 04 Sep 2004 10:22:38 +0000 reimar af_pan wants number of _input_ channels, fixes bugzilla bug #22
Sat, 04 Sep 2004 09:29:08 +0000 diego switch_vsync patch by Aurelien Jacobs <aurel @ gnuage.org>, small fix
Fri, 03 Sep 2004 22:18:46 +0000 kraymer sync to latest manpage reviews by Diego
Fri, 03 Sep 2004 20:22:22 +0000 al We don't need to support the old nvidia binary driver bug any longer.
Fri, 03 Sep 2004 20:18:28 +0000 gpoirier better documentation of not obvious subq default setting
Fri, 03 Sep 2004 17:47:34 +0000 gpoirier Diego's man page review part VIII commited, small syncs on video filters
Fri, 03 Sep 2004 17:42:52 +0000 diego alphabetical order
Fri, 03 Sep 2004 15:09:20 +0000 gpoirier All libavcodec encoding options are now documented
Fri, 03 Sep 2004 12:12:17 +0000 reimar improved suboption parsing, fixes also compiler warnings
Fri, 03 Sep 2004 10:50:03 +0000 reimar first attempt to make 24-bit PCM DVDs work
Fri, 03 Sep 2004 00:08:58 +0000 rfelker strictness level -1 to 'almost' ignore breaks
Thu, 02 Sep 2004 23:51:05 +0000 rfelker just some debugging junk i'd like to have in there for now :)
Thu, 02 Sep 2004 20:08:32 +0000 reimar missing initialization of round
Thu, 02 Sep 2004 19:48:41 +0000 michael hue filter bugfix by ("James Crowson" <jbcrowso at ncsu dot edu>)
Thu, 02 Sep 2004 19:33:17 +0000 nauj27 sync by Andoni Zubimendi <andoni at lpsat.net>
Thu, 02 Sep 2004 16:52:13 +0000 michael non spec compliant optizations support
Thu, 02 Sep 2004 12:18:36 +0000 faust3 subtitle autodetection regardles of case (bug #65), patches Michal Svec <rebel at atrey.karlin.mff.cuni.cz> and Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl>
Thu, 02 Sep 2004 12:02:06 +0000 faust3 slave mode command to en/disable vsync, patch by Aurelien Jacobs <aurel at gnuage.org>
Thu, 02 Sep 2004 11:34:25 +0000 faust3 fix for i420 format, initial patch by Aurelien Jacobs <aurel at gnuage.org> from the Geexbox mplayer patchset, some modification by me
Thu, 02 Sep 2004 06:57:51 +0000 wight sync tag bumped to 1.47
Thu, 02 Sep 2004 06:57:30 +0000 wight sync 1.65
Thu, 02 Sep 2004 06:57:07 +0000 wight sync 1.47
Thu, 02 Sep 2004 06:40:16 +0000 wight - <screen> -> <command>, improves readibility and sense.
Thu, 02 Sep 2004 00:46:21 +0000 diego typo
Wed, 01 Sep 2004 19:42:51 +0000 wight - sync 1.45
Wed, 01 Sep 2004 17:38:54 +0000 paszczi synced with 1.694 + additional fixes
Wed, 01 Sep 2004 15:05:34 +0000 diego man page review part VIII
Wed, 01 Sep 2004 15:02:02 +0000 gpoirier Fixes some upercase/points on sentences
Wed, 01 Sep 2004 02:31:24 +0000 ivo One-time cosmetics update.
Tue, 31 Aug 2004 18:46:19 +0000 gpoirier Sync against Diego's man page review part VI & VII
Tue, 31 Aug 2004 15:45:21 +0000 gpoirier Massive updates and sync on filters section.
Tue, 31 Aug 2004 10:31:15 +0000 diego man page review part VII
Tue, 31 Aug 2004 09:17:17 +0000 paszczi synced with 1.692 + random fixes
Tue, 31 Aug 2004 07:53:49 +0000 gpoirier cropdetect description update
Tue, 31 Aug 2004 01:24:51 +0000 diego man page review part VI
Tue, 31 Aug 2004 00:10:32 +0000 diego cropdetect style fixup
Tue, 31 Aug 2004 00:09:01 +0000 diego Compn wished for forcing codecs.
Tue, 31 Aug 2004 00:06:09 +0000 diego The threads lavc option may negatively affect motion estimation.
Mon, 30 Aug 2004 22:39:50 +0000 kraymer Modified Files:
Mon, 30 Aug 2004 21:06:52 +0000 reimar Using updated colorspace specifications from colorspaces.txt.
Mon, 30 Aug 2004 20:39:32 +0000 reimar Adds rounding parameter for width and height values returned.
Mon, 30 Aug 2004 20:34:25 +0000 danny synced with 1.682
Mon, 30 Aug 2004 20:17:31 +0000 reimar allow empty assignments, necessary for some weird servers...
Mon, 30 Aug 2004 19:11:18 +0000 gpoirier Small sync of just lavc options...
Mon, 30 Aug 2004 15:29:44 +0000 gpoirier Small syncs against english manpage around old-DiviX post-processing filtrers.
Mon, 30 Aug 2004 13:03:37 +0000 gpoirier removal of (hopefully) trailing spaces, small fixes and syncs.
Mon, 30 Aug 2004 11:05:19 +0000 diego URL with lavc option descriptions, pointed out by Attila.
Mon, 30 Aug 2004 09:23:28 +0000 diego unrarlib
Mon, 30 Aug 2004 08:49:32 +0000 paszczi synced with 1.64 + fixed previous sync
Mon, 30 Aug 2004 00:42:27 +0000 diego #ifdef simplification and higher consistency
Mon, 30 Aug 2004 00:10:39 +0000 diego For some reason the arts sdl audio subdriver is called artsc.
Sun, 29 Aug 2004 20:18:32 +0000 paszczi synced with 1.63
Sun, 29 Aug 2004 20:15:16 +0000 paszczi synced with 1.688 + some fixes
Sun, 29 Aug 2004 19:39:21 +0000 gpoirier Cumulative patch for all Diego's patches before Aug 29 18:38:15 CEST 2004. Some minor fixes too.
Sun, 29 Aug 2004 16:38:12 +0000 gpoirier Addition of x264 encoding options plus minor spelling and syncs
Sun, 29 Aug 2004 13:52:19 +0000 rtognimp AVC (fourcc avc1) in mp4 support
Sat, 28 Aug 2004 21:01:15 +0000 diego typo
Sat, 28 Aug 2004 20:59:49 +0000 rathann small gcc warning fixes
Sat, 28 Aug 2004 20:56:56 +0000 rathann small fixes
Sat, 28 Aug 2004 20:53:01 +0000 rathann fix overcomplicated macros and a few warnings
Sat, 28 Aug 2004 20:51:25 +0000 rathann fix missing includes
Sat, 28 Aug 2004 20:36:34 +0000 diego fall back to --> fall back on, some consistency
Sat, 28 Aug 2004 20:31:41 +0000 rathann use correct headers
Sat, 28 Aug 2004 20:22:38 +0000 rathann loader gcc warning fixes and avifile sync
Sat, 28 Aug 2004 20:20:40 +0000 rathann small gcc warning fix
Sat, 28 Aug 2004 20:00:46 +0000 diego x264 section reviewed.
Sat, 28 Aug 2004 19:47:21 +0000 diego more consistency, small changes
Sat, 28 Aug 2004 19:22:56 +0000 diego credits for Reynaldo Verdejo Pinochet
Sat, 28 Aug 2004 18:18:24 +0000 diego trailing whitespace
Sat, 28 Aug 2004 18:14:07 +0000 diego Small changes for added consistency.
Sat, 28 Aug 2004 17:35:32 +0000 diego Consistently insert lines with only "." between options.
Sat, 28 Aug 2004 17:25:30 +0000 gpoirier Sync against english manpage. All done until "video filters"
Sat, 28 Aug 2004 16:23:31 +0000 diego sync by Sebastian Kr¸«£mer <mail@skraemer.de>
Sat, 28 Aug 2004 15:10:36 +0000 paszczi synced with 1.682 + random fixes
Sat, 28 Aug 2004 14:00:36 +0000 wight Some more dependency tracking
Sat, 28 Aug 2004 11:46:19 +0000 diego updates by Sebastian Kr¸«£mer <mail@skraemer.de>
Sat, 28 Aug 2004 01:34:24 +0000 al Added Reynaldo as maintainter for MPlayer's EDL code.
Sat, 28 Aug 2004 00:46:05 +0000 rtognimp EDL enhancement/fixes:
Fri, 27 Aug 2004 21:20:16 +0000 faust3 Rough but working bigendian support for radeon cards, patch by Luca Barbato <lu_zero at gentoo.org>
Fri, 27 Aug 2004 20:43:05 +0000 iive x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
Fri, 27 Aug 2004 15:50:33 +0000 gpoirier Includes latest english patches translated in French, new sync against the
Fri, 27 Aug 2004 15:07:56 +0000 ivo Updated the AUTHORS file.
Fri, 27 Aug 2004 11:31:50 +0000 paszczi wording
Fri, 27 Aug 2004 11:29:50 +0000 paszczi sync with 1.681
Fri, 27 Aug 2004 08:25:17 +0000 henry sync to 1.125
Fri, 27 Aug 2004 02:12:11 +0000 diego better -slang description inspired by a patch from Guillaume Poirier
Fri, 27 Aug 2004 02:04:25 +0000 diego simplification
Thu, 26 Aug 2004 22:18:25 +0000 ivo Added output to multiple directories for vo_jpeg.
Thu, 26 Aug 2004 22:15:26 +0000 joey added "xbutton" support for 4-5 button mice
Thu, 26 Aug 2004 19:46:12 +0000 diego Patches should be gzip or bzip2 compressed if necessary.
Thu, 26 Aug 2004 19:38:16 +0000 nicodvb added forgotten dvb-t params lp_coderate and hierarchy
Thu, 26 Aug 2004 19:18:05 +0000 ivo Added myself as maintainer of vo_jpeg.
Thu, 26 Aug 2004 13:32:36 +0000 gpoirier fixed the removal of French maintainer of the Doc Nicolas Le Gaillart
Thu, 26 Aug 2004 12:07:02 +0000 henry clenups
Thu, 26 Aug 2004 11:55:34 +0000 gpoirier Changed the name of the French documentation maintainer
Thu, 26 Aug 2004 10:34:20 +0000 faust3 some more segfault fixes
Thu, 26 Aug 2004 10:12:14 +0000 michael 10l
Thu, 26 Aug 2004 09:24:03 +0000 rathann remove unnecessary mips check (it's obsolete anyway)
Thu, 26 Aug 2004 08:47:12 +0000 henry update
Thu, 26 Aug 2004 08:07:25 +0000 gpoirier More sync against latest english manpage patches and french grammar corrections
Thu, 26 Aug 2004 01:28:57 +0000 michael change to match current bgr/rgb definition
Thu, 26 Aug 2004 01:06:02 +0000 diego properly set linking flags for NetBSD, patch by jb13@gomerbud.com
Wed, 25 Aug 2004 19:41:01 +0000 wight sync + some small fixes
Wed, 25 Aug 2004 19:25:42 +0000 wight Add \: after /
Wed, 25 Aug 2004 18:00:12 +0000 paszczi synced with 1.677
Wed, 25 Aug 2004 16:47:32 +0000 diego Apparently the latin1 groff device gives better results than ascii.
Wed, 25 Aug 2004 16:29:21 +0000 faust3 prevent libmpeg2 from freeing sh
Wed, 25 Aug 2004 16:16:09 +0000 diego warning fixes and a 10l (.IPS vs .IPs)
Wed, 25 Aug 2004 15:40:06 +0000 diego Detect if the assembler supports receiving data through -pipe,
Wed, 25 Aug 2004 15:35:32 +0000 diego Search for X11 libs in /usr/lib as well (Digital Unix), patch by Gabucino.
Wed, 25 Aug 2004 15:20:39 +0000 diego keyboard control: some fixes and extensions, punctuation
Wed, 25 Aug 2004 15:07:39 +0000 diego Cycle through the available subtitles with 'b'.
Wed, 25 Aug 2004 13:09:56 +0000 iive allow alignment without ATTRIBUTE_ALIGNED_MAX been defined, it fixes sparc unaligned memory access
Wed, 25 Aug 2004 09:49:43 +0000 faust3 10l
Wed, 25 Aug 2004 07:52:52 +0000 mosu Cosmetics: fix some compiler warnings.
Wed, 25 Aug 2004 01:06:26 +0000 diego Document how to specify multiple paths with the --with-* options,
Tue, 24 Aug 2004 21:37:41 +0000 mosu Display the language code for subtitles from Matroska files.
Tue, 24 Aug 2004 21:29:51 +0000 henry compile fix (missing string)
Tue, 24 Aug 2004 21:20:24 +0000 mosu Do not use globals. Put the variables into the appropriate demuxer struct instead.
Tue, 24 Aug 2004 20:58:29 +0000 mosu Support for subtitle switching in Matroska.
Tue, 24 Aug 2004 20:48:24 +0000 danny Synced with 1.642, minor changes, space at end of line
Tue, 24 Aug 2004 20:42:27 +0000 nplourde add rgb32 csp support
Tue, 24 Aug 2004 20:23:11 +0000 henry postproc fix
Tue, 24 Aug 2004 19:36:17 +0000 diego printf -> mp_msg conversion, first steps
Tue, 24 Aug 2004 19:29:17 +0000 diego id3edit updated
Tue, 24 Aug 2004 19:08:29 +0000 diego updates by Guillaume POIRIER <gpoirier@irisa.fr>
Tue, 24 Aug 2004 17:40:31 +0000 nplourde fix crash when using close button
Tue, 24 Aug 2004 17:24:31 +0000 henry more TARGET_* conditionals
Tue, 24 Aug 2004 17:11:02 +0000 henry actually use the acceleration on SPARC
Tue, 24 Aug 2004 16:50:13 +0000 henry fix compilation withoud libdvdread
Tue, 24 Aug 2004 16:34:49 +0000 paszczi synced with 1.46
Tue, 24 Aug 2004 16:30:49 +0000 paszczi spelling
Tue, 24 Aug 2004 16:26:36 +0000 paszczi synced with 1.675
Tue, 24 Aug 2004 16:15:56 +0000 henry libmpeg2 B-frame fix
Tue, 24 Aug 2004 11:10:40 +0000 diego H.263 spelling
Tue, 24 Aug 2004 11:02:12 +0000 faust3 vm window handling fixes
Tue, 24 Aug 2004 10:55:02 +0000 diego cosmetics
Tue, 24 Aug 2004 10:52:28 +0000 diego spelling, rewording, some additions
Mon, 23 Aug 2004 23:24:27 +0000 diego vo_svga suboptions, yuv4mpeg note
Mon, 23 Aug 2004 23:18:31 +0000 diego wrong formats
Mon, 23 Aug 2004 22:49:42 +0000 diego 10l Pepsi
Mon, 23 Aug 2004 22:37:50 +0000 wight default style
Mon, 23 Aug 2004 22:28:37 +0000 diego updates by Guillaume POIRIER <gpoirier@irisa.fr>
Mon, 23 Aug 2004 22:26:05 +0000 diego large updates by Sebastian Kr¸«£mer <mail@skraemer.de>
Mon, 23 Aug 2004 09:52:25 +0000 iive prevent XFree execution on wrong condition
Mon, 23 Aug 2004 08:03:31 +0000 diego mime handling support, patch by Konstantin G. Khlebnikov <c00nst@ezmail.ru>
Mon, 23 Aug 2004 07:51:10 +0000 wight Check if -liconv is needed for iconv.
Mon, 23 Aug 2004 00:31:33 +0000 attila Make the stepsize of volume changes, changeable by a commandline paarameter
Mon, 23 Aug 2004 00:25:19 +0000 attila Adding doxygen stuff.
Sun, 22 Aug 2004 21:47:22 +0000 diego small fixes
Sun, 22 Aug 2004 19:55:58 +0000 wight sync
Sun, 22 Aug 2004 19:52:50 +0000 joey fix for audio position inaccuracy
Sun, 22 Aug 2004 19:36:27 +0000 wight sync tag bump
Sun, 22 Aug 2004 19:34:13 +0000 joey forgot some ifdef's and broke mplayer.c without ogg & dvdread
Sun, 22 Aug 2004 19:01:56 +0000 joey added runtime toggle of root window playback
Sun, 22 Aug 2004 18:57:45 +0000 joey added -rootwin support to vo_directx
Sun, 22 Aug 2004 18:47:48 +0000 joey moved combined vobsub_lang into sub_select
Sun, 22 Aug 2004 17:09:42 +0000 diego spelling/wording as suggested by Sebastian Kr¸«£mer <mail@skraemer.de>
Sun, 22 Aug 2004 16:43:53 +0000 diego wording fix suggested by the Wanderer
Sun, 22 Aug 2004 15:58:00 +0000 wight sync 1.669
Sun, 22 Aug 2004 15:47:53 +0000 wight minor fixes
Sun, 22 Aug 2004 15:44:26 +0000 wight sync
Sun, 22 Aug 2004 15:36:40 +0000 rtognimp H.261 support via lavc codec and lavf demuxer
Sun, 22 Aug 2004 14:50:51 +0000 diego spelling
Sun, 22 Aug 2004 14:43:42 +0000 diego more genre IDs by Bernd Ernesti <mplayer@lists.veego.de>
Sun, 22 Aug 2004 14:34:37 +0000 diego updates by Sebastian Kr¸«£mer <mail@skraemer.de>
Sun, 22 Aug 2004 14:06:13 +0000 diego small fixes by Sebastian Kr¸«£mer <mail@skraemer.de>
Sat, 21 Aug 2004 22:56:02 +0000 wight sync + random fixes
Sat, 21 Aug 2004 22:47:00 +0000 wight minor fixes
Sat, 21 Aug 2004 21:08:07 +0000 wight missing \
Sat, 21 Aug 2004 19:46:24 +0000 alex support for snow
Sat, 21 Aug 2004 19:31:00 +0000 alex support snow
Sat, 21 Aug 2004 19:22:11 +0000 alex ffsonic
Sat, 21 Aug 2004 19:17:17 +0000 alex nut is only handled by lavf, speed up detection
Sat, 21 Aug 2004 16:52:54 +0000 lumag sync
Sat, 21 Aug 2004 16:52:41 +0000 lumag Include origin text for quote.
Sat, 21 Aug 2004 15:43:00 +0000 diego updates by Sebastian Kr¸«£mer <mail@skraemer.de>
Sat, 21 Aug 2004 15:26:30 +0000 diego man page review part V
Sat, 21 Aug 2004 11:37:06 +0000 diego updates by Guillaume POIRIER <gpoirier@irisa.fr>
Sat, 21 Aug 2004 08:57:29 +0000 paszczi sync
Fri, 20 Aug 2004 20:39:17 +0000 diego Fix English before the translations.
Fri, 20 Aug 2004 20:22:25 +0000 diego man page review part IV
Fri, 20 Aug 2004 18:29:25 +0000 rtognimp typo
Fri, 20 Aug 2004 17:15:44 +0000 diego Credits for Guillaume Poirier, maintainers are listed elsewhere.
Fri, 20 Aug 2004 17:01:32 +0000 diego spelling/wording fixes
Fri, 20 Aug 2004 14:09:16 +0000 syrjala Removed fb_dev_name handling.
Fri, 20 Aug 2004 11:57:02 +0000 wight sync 1.663
Fri, 20 Aug 2004 11:43:42 +0000 wight consistency fix, same sentence should be changed to same
Fri, 20 Aug 2004 11:33:46 +0000 wight sync 1.17
Fri, 20 Aug 2004 09:41:13 +0000 al Removed superfluous XFlush calls before XSync.
Thu, 19 Aug 2004 17:18:06 +0000 diego portability fix taken from the NetBSD patch set
Thu, 19 Aug 2004 16:26:16 +0000 diego updates by Guillaume POIRIER <gpoirier@irisa.fr>
Thu, 19 Aug 2004 14:45:07 +0000 diego better description of the chroma_opt XviD option
Thu, 19 Aug 2004 12:10:07 +0000 diego spelling/wording consistency as suggested by the Wanderer
Thu, 19 Aug 2004 11:57:33 +0000 diego readability whitespace fix
Thu, 19 Aug 2004 11:48:57 +0000 diego updates by Guillaume POIRIER <gpoirier@irisa.fr>
Thu, 19 Aug 2004 09:59:25 +0000 nicodvb user can select which dvb card to use as vo
Thu, 19 Aug 2004 09:51:07 +0000 nicodvb user can select dvb card number to use (V3 api only)
Wed, 18 Aug 2004 19:00:05 +0000 diego spelling: big-endian and little-endian
less more | rev 13494: (0) -10000 -3000 -1000 -448 +448 +1000 +3000 +10000 tip