Mercurial > mplayer.hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 9033: (0) -3000 -1000 -240 +240 +1000 +3000 +10000 tip
age author description
Sun, 19 Jan 2003 19:17:06 +0000 arpi prefer ffhuffyuv over mphuffyuv
Sun, 19 Jan 2003 19:02:39 +0000 arpi 10l
Sun, 19 Jan 2003 18:28:16 +0000 pontscho 11l:)
Sun, 19 Jan 2003 18:25:21 +0000 michael update
Sun, 19 Jan 2003 17:44:33 +0000 diego typo
Sun, 19 Jan 2003 17:19:29 +0000 diego typos and wording
Sun, 19 Jan 2003 16:52:00 +0000 alex conformation with api
Sun, 19 Jan 2003 16:49:02 +0000 arpi When the file is not finished to be written,
Sun, 19 Jan 2003 16:44:32 +0000 alex cleanup and removal of libdha_exit. forgot to commit this
Sun, 19 Jan 2003 16:42:25 +0000 alex support runtime cpudetect on non-x86 systems too
Sun, 19 Jan 2003 16:10:38 +0000 alex Updated to v0.1.4 by Alastair Robinson <blackfive@fakenhamweb.co.uk>
Sun, 19 Jan 2003 15:43:12 +0000 arpi This patch adds support for 4Front Technologies commercial Open Sound
Sun, 19 Jan 2003 15:41:26 +0000 arpi * Remove unneeded includes & macros
Sun, 19 Jan 2003 15:28:29 +0000 arpi update by hephooey@fastmail.fm
Sun, 19 Jan 2003 15:25:03 +0000 arpi fixed query_format (RGB24 supports OSD and is preferred)
Sun, 19 Jan 2003 14:48:19 +0000 henry 10l
Sun, 19 Jan 2003 10:42:09 +0000 nicolas sync
Sun, 19 Jan 2003 10:26:35 +0000 nicolas sync
Sun, 19 Jan 2003 06:43:13 +0000 gabucino seems fixed (it works now)
Sun, 19 Jan 2003 01:48:52 +0000 arpi Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
Sun, 19 Jan 2003 01:25:35 +0000 arpi 1l :)
Sun, 19 Jan 2003 01:24:56 +0000 arpi some URLs
Sun, 19 Jan 2003 01:17:15 +0000 arpi more ?'s
Sun, 19 Jan 2003 01:15:39 +0000 arpi more ;)
Sun, 19 Jan 2003 00:54:55 +0000 arpi 1) Removed the code to remove {} from sub_read_line_ssa
Sun, 19 Jan 2003 00:40:48 +0000 arpi - added some more
Sun, 19 Jan 2003 00:33:11 +0000 arpi Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
Sun, 19 Jan 2003 00:21:54 +0000 arpi extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
Sat, 18 Jan 2003 21:09:22 +0000 gabucino typo
Sat, 18 Jan 2003 21:08:17 +0000 gabucino sync
Sat, 18 Jan 2003 19:29:46 +0000 arpi AltiVec detection code ("borrowed" from FFmpeg and
Sat, 18 Jan 2003 19:28:53 +0000 arpi An altivec-optimized DCT64 for mp3lib
Sat, 18 Jan 2003 19:28:29 +0000 arpi An AltiVec-enhanced IMDCT for liba52 (liba52/imdct.c)
Sat, 18 Jan 2003 19:26:33 +0000 gabucino sync
Sat, 18 Jan 2003 19:26:24 +0000 gabucino uselessly long DGA subsections removed from TOC
Sat, 18 Jan 2003 19:25:36 +0000 gabucino removed obsolete stuff
Sat, 18 Jan 2003 19:24:46 +0000 gabucino sync
Sat, 18 Jan 2003 19:08:42 +0000 arpi - restore old behaviour of -channels,-srate,-format
Sat, 18 Jan 2003 17:34:02 +0000 arpi 2-pass libaf initialization to get better filter chain.
Sat, 18 Jan 2003 17:31:58 +0000 arpi export fmt2str()
Sat, 18 Jan 2003 17:31:22 +0000 arpi added af_format_encode() to convert sample format from libaf to mplayer (OSS)
Sat, 18 Jan 2003 16:49:43 +0000 gabucino sync
Sat, 18 Jan 2003 15:05:06 +0000 attila xinerama fix part 1 - count your paranthesis
Sat, 18 Jan 2003 14:57:44 +0000 nicolas sync
Sat, 18 Jan 2003 14:36:18 +0000 nicolas sync
Sat, 18 Jan 2003 14:33:29 +0000 attila xinerama fix part 1
Sat, 18 Jan 2003 14:22:30 +0000 bertrand Support for MPEG-4 (AAC) audio RTSP/RTP
Sat, 18 Jan 2003 13:58:34 +0000 nicolas sync
Sat, 18 Jan 2003 13:44:52 +0000 nicolas sync
Sat, 18 Jan 2003 05:41:41 +0000 rfelker it *worked*, but probably wasn't what was intended, and could break if
Sat, 18 Jan 2003 02:07:56 +0000 diego Wording improvements.
Sat, 18 Jan 2003 01:29:44 +0000 diego Removed some "!s, corrected some spelling, gave the system too slow message
Sat, 18 Jan 2003 01:18:23 +0000 pontscho not needed
Sat, 18 Jan 2003 01:07:46 +0000 pontscho 10l
Sat, 18 Jan 2003 01:06:05 +0000 arpi 10l :)
Sat, 18 Jan 2003 00:43:01 +0000 pontscho 10l
Sat, 18 Jan 2003 00:22:18 +0000 pontscho 10l found by Arpi (njamd)
Fri, 17 Jan 2003 23:50:53 +0000 arpi 10l
Fri, 17 Jan 2003 23:29:14 +0000 pontscho 10l
Fri, 17 Jan 2003 22:50:18 +0000 pontscho hm ...
Fri, 17 Jan 2003 22:39:43 +0000 pontscho - add playbar
Fri, 17 Jan 2003 21:44:58 +0000 rtognimp Remove duplicated code
Fri, 17 Jan 2003 20:14:10 +0000 nicolas sync
Fri, 17 Jan 2003 19:59:15 +0000 nicolas sync
Fri, 17 Jan 2003 01:00:07 +0000 anders Adding support for more logical libaf configuration
Thu, 16 Jan 2003 23:40:42 +0000 arpi telecine messages
Thu, 16 Jan 2003 23:40:31 +0000 arpi telecine detection
Thu, 16 Jan 2003 23:03:06 +0000 arpi 10l
Thu, 16 Jan 2003 22:34:46 +0000 arpi fixed the well-known DVD/DVB audio delay bug :)
Thu, 16 Jan 2003 19:51:08 +0000 pontscho preferences cosmetics
Thu, 16 Jan 2003 08:02:59 +0000 pontscho upsz :)
Wed, 15 Jan 2003 22:44:35 +0000 bertrand Removed the hardcoded cdrom device.
Wed, 15 Jan 2003 20:40:57 +0000 pl fix small typos (accents mainly)
Wed, 15 Jan 2003 20:36:18 +0000 jonas 2 new compare functions ...
Wed, 15 Jan 2003 19:33:01 +0000 michael 2 new compare functions ...
Wed, 15 Jan 2003 17:50:21 +0000 bertrand Removed the hardcoded /dev/cdrom for NetBSD and added an work around
Wed, 15 Jan 2003 11:16:33 +0000 mosu bunkus: Encapsulated arguments to #define in ( ... ) so that the #defines can be safely used like functions: mydef(flag ? val1 : val2)
Wed, 15 Jan 2003 09:50:44 +0000 mosu bunkus: Updates until 2003-01-14 13:54
Tue, 14 Jan 2003 23:15:36 +0000 arpi sanity checks - patch by Fabian Franz <FabianFranz@gmx.de>
Tue, 14 Jan 2003 22:03:15 +0000 rtognimp BGR16 is not a valid format for this codec
Tue, 14 Jan 2003 18:20:17 +0000 rfelker NTSC is 29.97 fps, not 30. wrong values here are likely to cause
Tue, 14 Jan 2003 02:52:10 +0000 anders Fix for endianess conversion if input to libaf is float
Tue, 14 Jan 2003 00:03:10 +0000 diego Wrong -lavcopts aspect= parameter format, noticed by nico <nsabbi@libero.it>.
Mon, 13 Jan 2003 23:45:14 +0000 diego Small updates for correctness and consistency.
Mon, 13 Jan 2003 23:38:49 +0000 pontscho correct skin changing
Mon, 13 Jan 2003 19:39:57 +0000 diego Sync by <hephooey@fastmail.fm>.
Mon, 13 Jan 2003 19:38:52 +0000 rfelker don't waste time on rg_scale nonsense if not necessary.
Mon, 13 Jan 2003 19:18:26 +0000 rfelker 1000l, this clips!! IMO rg_scale nonsense should be removed with
Mon, 13 Jan 2003 14:53:51 +0000 diego Sync by <hephooey@fastmail.fm>.
Mon, 13 Jan 2003 13:43:48 +0000 diego DivX CVS instructions as provided by Alex Kloss <alex@22-music.com>.
Mon, 13 Jan 2003 12:31:31 +0000 arpi up
Mon, 13 Jan 2003 10:21:22 +0000 alex M6 bug workaround by Hanno Bock <hanno@gmx.de>
Mon, 13 Jan 2003 10:08:21 +0000 alex M6 bug workaround by Hanno Bock <hanno@gmx.de>
Mon, 13 Jan 2003 10:07:38 +0000 mosu bunkus: fixed a small bug with skipping "{...}" in ssa subs
Mon, 13 Jan 2003 03:10:19 +0000 arpi better cache size defaults
Mon, 13 Jan 2003 03:08:56 +0000 arpi do not discard cache content at seeking type=STREAMTYPE_STREAM
Mon, 13 Jan 2003 02:42:06 +0000 arpi patch adds support for MOV-Reference-Files.
Mon, 13 Jan 2003 01:50:20 +0000 atmos4 debug++
Mon, 13 Jan 2003 01:20:21 +0000 atmos4 10l, init priv->X at right place
Mon, 13 Jan 2003 00:45:04 +0000 rfelker libvorbisidec already includes ogg parser code; no sense in depending on more libs
Sun, 12 Jan 2003 23:38:55 +0000 pontscho add DVD and CDRom device entry's, and fix two 10l bug
Sun, 12 Jan 2003 22:40:51 +0000 arpi The following patch adds a call to srand() with the current time at the
Sun, 12 Jan 2003 21:26:42 +0000 gabucino sync
Sun, 12 Jan 2003 21:24:19 +0000 gabucino fixes
Sun, 12 Jan 2003 20:16:28 +0000 arpi check if seeking supported, otherwise fallback to null reading
Sun, 12 Jan 2003 20:11:20 +0000 arpi (hopefully) fixed .mov streaming
Sun, 12 Jan 2003 20:03:48 +0000 arpi sanity check
Sun, 12 Jan 2003 19:55:59 +0000 pontscho upsz :))))))))))))))
Sun, 12 Jan 2003 19:41:38 +0000 arpi this patch adds an fallback to playlist (any but the plaintext-list format)
Sun, 12 Jan 2003 19:32:56 +0000 mswitch Added patch from Tamas Kohegyi to fix subpic placement with freetype
Sun, 12 Jan 2003 19:07:10 +0000 pontscho "cosmetic" :)
Sun, 12 Jan 2003 18:58:07 +0000 arpi a->sub_aligment
Sun, 12 Jan 2003 18:56:48 +0000 arpi use 'a' for subtitle aligment instead for useless gui aboutbox
Sun, 12 Jan 2003 18:35:53 +0000 pontscho not needed.
Sun, 12 Jan 2003 18:09:17 +0000 rtognimp Sync with help_mp-en.h v1.77
Sun, 12 Jan 2003 17:59:47 +0000 arpi -geometry fix (untested!)
Sun, 12 Jan 2003 17:46:21 +0000 arpi debug
Sun, 12 Jan 2003 17:34:46 +0000 pontscho motion fix from Gregory Kovriga <gkovriga@techunix.technion.ac.il>
Sun, 12 Jan 2003 16:45:42 +0000 nicolas sync
Sun, 12 Jan 2003 15:48:29 +0000 nicolas sync, more accurate translation
Sun, 12 Jan 2003 15:32:54 +0000 rtognimp Signal handler messages moved to help_mp, so they can be translated
Sun, 12 Jan 2003 14:33:46 +0000 jaf 2003
Sun, 12 Jan 2003 14:20:37 +0000 eyck Pass control to debhelper scripts
Sun, 12 Jan 2003 14:18:15 +0000 nicolas sync
Sun, 12 Jan 2003 13:34:06 +0000 eyck postinst should pass control to debconf scripts.
Sun, 12 Jan 2003 13:20:25 +0000 eyck Purge debconf database on purge.
Sun, 12 Jan 2003 11:45:49 +0000 mosu bunkus: Another nice off-by-one :)
Sun, 12 Jan 2003 10:12:13 +0000 nicolas sync
Sun, 12 Jan 2003 08:05:51 +0000 anders 10l sig 11 bug reported by Fabian Franz
Sat, 11 Jan 2003 23:26:09 +0000 nicolas sync
Sat, 11 Jan 2003 23:11:48 +0000 nicolas sync
Sat, 11 Jan 2003 23:08:11 +0000 arpi libavcodec just imported code for OS/2 support, which means we must
Sat, 11 Jan 2003 22:31:28 +0000 arpi Happy New Year :)
Sat, 11 Jan 2003 22:26:58 +0000 jonas bandwidth, cuefile/vcd, osdlevel, dfbopts, eq2, bmovl, lavc: vstrict, psnr, removed yvu9, some cosmetics
Sat, 11 Jan 2003 21:49:21 +0000 nicolas sync
Sat, 11 Jan 2003 21:08:41 +0000 nicolas sync
Sat, 11 Jan 2003 21:01:48 +0000 arpi This patch adds support for some silly ini-style-playlist-file-format ...
Sat, 11 Jan 2003 20:33:04 +0000 arpi add prelim -lameopts help
Sat, 11 Jan 2003 18:58:42 +0000 diego Added links to encoding-tips and mplayer-users.
Sat, 11 Jan 2003 17:32:45 +0000 arpi better error handling for invalud suboptions
Sat, 11 Jan 2003 17:01:23 +0000 arpi cosmetics
Sat, 11 Jan 2003 16:42:24 +0000 arpi print meaningful error message
Sat, 11 Jan 2003 14:09:19 +0000 diego Further libaf documentation by Anders with some more updates by me.
Sat, 11 Jan 2003 14:02:23 +0000 bertrand Finally commented out the code for autodetection based on the extension.
Sat, 11 Jan 2003 12:32:24 +0000 arpi The attached little patch fixes a core dump on termcap systems when
Sat, 11 Jan 2003 10:35:31 +0000 alex remove codec-cfg binary during make distclean (btw, why do we compile it anyway?)
Sat, 11 Jan 2003 10:27:07 +0000 nexus sync
Sat, 11 Jan 2003 09:20:36 +0000 pontscho add osd_level=3 support
Sat, 11 Jan 2003 05:06:48 +0000 rfelker I hope this works as expected with old lavc versions. At least it compiles now.
Sat, 11 Jan 2003 01:30:37 +0000 pontscho add some entry's :)
Sat, 11 Jan 2003 01:30:07 +0000 pontscho - new font render finished
Fri, 10 Jan 2003 22:53:34 +0000 arpi Overlapping subs are a feature mainly present in subtitling
Fri, 10 Jan 2003 22:48:49 +0000 arpi Function DVDOpenVOBPath only decrypts first VOB file and since each VOB file has
Fri, 10 Jan 2003 22:41:49 +0000 arpi buffer overflow fix :)
Fri, 10 Jan 2003 21:57:06 +0000 rfelker document Arpi's #2,3,7 (fps, immediatemode, eq2). #6,9,10,11 still
Fri, 10 Jan 2003 21:44:28 +0000 rfelker may not be perfect but it's certainly a start. feel free to change
Fri, 10 Jan 2003 21:10:32 +0000 michael psnr
Fri, 10 Jan 2003 20:38:37 +0000 arpi patch which removes the rage_ckey_model fix and updates
Fri, 10 Jan 2003 19:38:09 +0000 rfelker document new halfpack option
Fri, 10 Jan 2003 18:28:18 +0000 filon Workaround for returning very litte buffer space.
Fri, 10 Jan 2003 17:17:41 +0000 rfelker 5l for me too :) BTW this should also be mentioned in the commands
Fri, 10 Jan 2003 16:10:20 +0000 rfelker 5l to whoever left this out
Fri, 10 Jan 2003 15:27:08 +0000 arpi updated :)
Fri, 10 Jan 2003 14:12:07 +0000 rfelker halfpack now takes an optional argument, field, which tells it to keep
Fri, 10 Jan 2003 10:43:01 +0000 rfelker use mp_msg for messages. prolly more filters need to be fixed like this too
Fri, 10 Jan 2003 01:45:34 +0000 anders 10l bug for float conversion control + feature fix in volume control
Fri, 10 Jan 2003 01:01:38 +0000 anders New auto config for volume and resample and added support for float flag in configuration
Thu, 09 Jan 2003 21:23:54 +0000 filon Remember window layer befor changing it.
Thu, 09 Jan 2003 20:53:01 +0000 pontscho 10l
Thu, 09 Jan 2003 20:47:14 +0000 pontscho - sync with x11_common
Thu, 09 Jan 2003 20:42:01 +0000 rtognimp Sync with help_mp-en.h ver 1.73
Thu, 09 Jan 2003 19:25:05 +0000 arpi Since version 2.7 the file extension for JACOsub changed from
Thu, 09 Jan 2003 19:01:24 +0000 arpi libavcodec (from ffmpeg) requires CONFIG_DARWIN to enable AltiVec on Darwin/MacOSX
Thu, 09 Jan 2003 18:39:09 +0000 arpi cpu cache line length detection
Thu, 09 Jan 2003 18:28:56 +0000 arpi Set is_shift_required according to RadeonFamily
Thu, 09 Jan 2003 18:27:50 +0000 arpi Fix support for Radeon 9000
Thu, 09 Jan 2003 18:27:13 +0000 arpi Reduce flickering on window movement (from Christophe Badina)
Thu, 09 Jan 2003 18:26:38 +0000 arpi Fix radeon 7500 and 8500 15- and 16-bit colour key
Thu, 09 Jan 2003 18:25:54 +0000 arpi Update card (chip family) detection (from mplayerxp)
Thu, 09 Jan 2003 18:23:30 +0000 arpi Update radeon pci ids
Thu, 09 Jan 2003 18:06:32 +0000 arpi 10l
Thu, 09 Jan 2003 18:00:58 +0000 arpi check if prop_hdr==NULL insteda of sig11
Thu, 09 Jan 2003 09:37:53 +0000 diego Appendix B and E numbered, encoding moved to a separate section.
Thu, 09 Jan 2003 09:35:01 +0000 diego -af delay description incorrect, as noticed by Arpi.
Thu, 09 Jan 2003 09:32:28 +0000 diego another pan example by Anders
Thu, 09 Jan 2003 09:27:51 +0000 arpi 10l
Wed, 08 Jan 2003 22:08:59 +0000 diego Moved ARM to the Linux ports section where it belongs.
Wed, 08 Jan 2003 22:04:40 +0000 mosu bunkus: updated translations. removed the boldness from <B>MPlayer</B>. removed DOS newlines (yuck).
Wed, 08 Jan 2003 20:00:55 +0000 diego 10l to A'rpi
Wed, 08 Jan 2003 19:59:46 +0000 diego Report X color depth for XVIDIX problems.
Wed, 08 Jan 2003 18:36:36 +0000 arpi I have seen problems where DVD subtitles don't display
Wed, 08 Jan 2003 18:19:30 +0000 arpi update
Wed, 08 Jan 2003 16:10:39 +0000 arpi do not create bogus filenames
Wed, 08 Jan 2003 14:55:56 +0000 arpi - init & check SDL availability at preinit() (fixes -vo sdl,mga)
Wed, 08 Jan 2003 14:11:33 +0000 jkeil For solaris, sys/smedia.h header is not needed any more. Compilation was
Tue, 07 Jan 2003 23:10:09 +0000 arpi 100l to doxmaintainers
Tue, 07 Jan 2003 22:35:47 +0000 arpi qt cvid ad some yet-crashing qt codecs added
Tue, 07 Jan 2003 21:35:58 +0000 gabucino removed obsolete/FIXED bugs
Tue, 07 Jan 2003 20:58:25 +0000 filon Fixed metacity + xv behavior (something broke it lately).
Tue, 07 Jan 2003 19:02:24 +0000 mosu bunkus: also translated this document
Tue, 07 Jan 2003 12:17:57 +0000 mosu bunkus: Updated/newly translated German version of the docs
Tue, 07 Jan 2003 10:33:30 +0000 anders Adding sub-woofer filter, use this filter to add a sub channel to the audio stream
Tue, 07 Jan 2003 00:02:02 +0000 diego XMMS plugin support, ARM section updated, some whitespace for the IRIX
Mon, 06 Jan 2003 21:58:39 +0000 arpi - always print the longest stream in info, not the selected one
Mon, 06 Jan 2003 19:02:00 +0000 nicolas sync
Mon, 06 Jan 2003 18:01:54 +0000 nicolas sync
Mon, 06 Jan 2003 17:58:17 +0000 nicolas sync'ed title's section with encoding.html
Mon, 06 Jan 2003 17:54:53 +0000 nicolas sync
Mon, 06 Jan 2003 17:38:05 +0000 nicolas sync
Mon, 06 Jan 2003 16:43:42 +0000 bertrand Return another error code for timeout.
Mon, 06 Jan 2003 16:42:20 +0000 bertrand 10l bug...
Mon, 06 Jan 2003 14:56:16 +0000 filon Sanity checks.
Mon, 06 Jan 2003 14:54:36 +0000 filon 10l (was segfaulting on non-dv file)
Mon, 06 Jan 2003 13:12:09 +0000 arpi 10l? :)
Mon, 06 Jan 2003 12:27:39 +0000 filon Update font scale after changing pancan.
Mon, 06 Jan 2003 12:23:59 +0000 filon Use standard mplayer message funtion.
Mon, 06 Jan 2003 09:44:28 +0000 atmos4 10l, hopefully correct fix, before path was always overwritten to '/'
Mon, 06 Jan 2003 04:58:20 +0000 rfelker fix lots of stuff that was outdated, unclear, inaccurate, or
Mon, 06 Jan 2003 01:12:30 +0000 arpi dirname() (from libgen) dependency removed
Mon, 06 Jan 2003 01:07:17 +0000 arpi YUV a:b:c explained
Mon, 06 Jan 2003 00:47:47 +0000 arpi i felt that libgen.h will not be portable...
Sun, 05 Jan 2003 23:51:05 +0000 arpi vcd_read_cue.h -> cue_read.c+h
Sun, 05 Jan 2003 21:42:27 +0000 jonas 10l ;)
Sun, 05 Jan 2003 21:39:18 +0000 jonas 10l, osdlevel, fixes
Sun, 05 Jan 2003 21:36:59 +0000 gabucino new bugs :(
Sun, 05 Jan 2003 21:22:23 +0000 gabucino sync
Sun, 05 Jan 2003 21:15:28 +0000 gabucino OSD has 4 levels
Sun, 05 Jan 2003 19:21:11 +0000 jonas updates
Sun, 05 Jan 2003 19:10:42 +0000 michael YUV 411/422/444 support for pp
Sun, 05 Jan 2003 16:44:44 +0000 michael oops
Sun, 05 Jan 2003 16:06:18 +0000 michael qpel & pre ME improvements
Sun, 05 Jan 2003 15:45:55 +0000 arpi ehh.. 10l again
Sun, 05 Jan 2003 15:39:52 +0000 arpi - added x/y rounding for YUV formats (should be moved to mp_image.c|h later)
Sun, 05 Jan 2003 15:39:16 +0000 alex fixed some possible overflow places
Sun, 05 Jan 2003 14:58:05 +0000 henry -nosound fix
Sun, 05 Jan 2003 14:49:57 +0000 arpi qt vs. voxware fixed (hopefully), also some qt speedup
Sun, 05 Jan 2003 14:35:35 +0000 arpi 10l...
Sun, 05 Jan 2003 14:18:53 +0000 arpi -nosound warning
Sun, 05 Jan 2003 13:48:13 +0000 mosu mosu: Fixed OGG/OGM seeking for XCDs in which the OGG/OGM does not start at pos 0 in the stream
Sun, 05 Jan 2003 13:32:57 +0000 henry sanity check
less more | rev 9033: (0) -3000 -1000 -240 +240 +1000 +3000 +10000 tip