| Sun, 20 Apr 2008 16:06:41 +0000 |
rtogni |
Add support for msn siren audio coced via binary dll sirenacm.dll
|
| Sun, 20 Apr 2008 00:36:45 +0000 |
rtogni |
Canopus HQ tries to load the auxiliary dlls with lowercase filename
|
| Sat, 19 Apr 2008 21:56:31 +0000 |
compn |
add canopus codecs, patch by Gianluigi Tiesi
|
| Sat, 19 Apr 2008 16:53:44 +0000 |
rtogni |
Revert r26412: policy violation
|
| Sat, 19 Apr 2008 16:51:28 +0000 |
rtogni |
Revert r26411: policy violation
|
| Sat, 19 Apr 2008 09:58:01 +0000 |
attila |
revert commits 26437-26439
|
| Sat, 19 Apr 2008 09:53:42 +0000 |
diego |
Add dependency information to recursive rules. While more eager than strictly
|
| Sat, 19 Apr 2008 09:44:48 +0000 |
diego |
Add missing recursive rule for libmpcodecs/libmpencoders.a.
|
| Sat, 19 Apr 2008 09:43:53 +0000 |
diego |
cosmetics: Sort recursive rules alphabetically.
|
| Fri, 18 Apr 2008 22:49:17 +0000 |
diego |
per-file dependencies (for the non-recursive parts)
|
| Fri, 18 Apr 2008 21:47:51 +0000 |
diego |
Adjust dependency generation prerequisites to new structure.
|
| Fri, 18 Apr 2008 21:46:52 +0000 |
diego |
Always generate dependency information. This also allows dropping the
|
| Fri, 18 Apr 2008 17:26:00 +0000 |
ptt |
synced with r26460
|
| Fri, 18 Apr 2008 17:24:49 +0000 |
ptt |
restore options alphabetical order
|
| Fri, 18 Apr 2008 08:13:00 +0000 |
diego |
Mark phony targets as such.
|
| Fri, 18 Apr 2008 08:12:41 +0000 |
diego |
Simplify phony target declaration.
|
| Fri, 18 Apr 2008 07:16:22 +0000 |
diego |
10l: Rename remaining instances of $i to $lang.
|
| Thu, 17 Apr 2008 21:54:43 +0000 |
diego |
cosmetics: __asm__ __volatile__ --> asm volatile
|
| Wed, 16 Apr 2008 12:03:34 +0000 |
reimar |
Prefer libavformat musepack demuxer over internal one (which does not even support v8).
|
| Tue, 15 Apr 2008 13:20:15 +0000 |
albeu |
noconfig fix, disable_gui_conf was not defined when compiling mencoder.
|
| Tue, 15 Apr 2008 02:02:29 +0000 |
corey |
typo: crahes --> crashes
|
| Tue, 15 Apr 2008 01:51:43 +0000 |
corey |
Refer to where encoding quality is described.
|
| Tue, 15 Apr 2008 01:40:38 +0000 |
corey |
As of r19025, the "above link" refers to an article, not a guide.
|
| Mon, 14 Apr 2008 11:24:24 +0000 |
albeu |
Fix the indentation after the noconfig patch.
|
| Mon, 14 Apr 2008 11:23:18 +0000 |
albeu |
10L, forgot to commit the documentation for the -noconfig options.
|
| Mon, 14 Apr 2008 11:21:29 +0000 |
albeu |
Add options to disable some or all config files.
|
| Mon, 14 Apr 2008 11:05:52 +0000 |
albeu |
Add support for system wide config file in mencoder.
|
| Sun, 13 Apr 2008 23:04:07 +0000 |
uau |
demux_asf: Fix operator precedence in packet length check
|
| Sun, 13 Apr 2008 22:57:47 +0000 |
diego |
Add libpostproc to list of pseudo-dependencies.
|
| Sun, 13 Apr 2008 21:23:27 +0000 |
diego |
Declare all clean targets phony in mpcommon.mak.
|
| Sun, 13 Apr 2008 21:21:42 +0000 |
diego |
The TAGS and tags targets are not phony.
|
| Sun, 13 Apr 2008 21:20:29 +0000 |
diego |
Add gui subdirectories to DIRS instead of manually cleaning them.
|
| Sun, 13 Apr 2008 21:13:05 +0000 |
diego |
Replace shell for loop by proper make foreach construct.
|
| Sun, 13 Apr 2008 19:18:51 +0000 |
albeu |
Replace the trivial command line preparser with a more robust version
|
| Sun, 13 Apr 2008 11:15:08 +0000 |
attila |
cosmetics: fix indentation
|
| Sun, 13 Apr 2008 11:12:24 +0000 |
attila |
move the #ifdef HAVE_XINERAMA to enclose the whole function
|
| Sun, 13 Apr 2008 11:08:59 +0000 |
attila |
Always calculate the xinerama screen mplayer is on.
|
| Sun, 13 Apr 2008 10:59:11 +0000 |
diego |
Fix DEPEND_CMD, there was one level of variable indirection too much.
|
| Sun, 13 Apr 2008 10:54:33 +0000 |
diego |
Sync with latest FFmpeg changes.
|
| Sun, 13 Apr 2008 10:44:21 +0000 |
diego |
Add Makefile variable for DVB OSD menu, saves one ifeq.
|
| Sun, 13 Apr 2008 10:23:54 +0000 |
nicodvb |
in preparation for multi-frontend patch replaced file-static device names with sprintf() calls in 2 functions
|
| Sun, 13 Apr 2008 09:09:36 +0000 |
diego |
Replace "all rights reserved" statement with standard GPL license header.
|
| Sun, 13 Apr 2008 07:57:35 +0000 |
diego |
Restore compilation of osdep/mplayer-rc.o.
|
| Sun, 13 Apr 2008 02:35:30 +0000 |
zuxy |
Set dll_type and rv_handle for drvc.dll
|
| Sun, 13 Apr 2008 01:29:24 +0000 |
diego |
Relicense test/example files as LGPL with Michael's permission.
|
| Sun, 13 Apr 2008 00:29:02 +0000 |
zuxy |
Add Chinese comment
|
| Sun, 13 Apr 2008 00:03:11 +0000 |
diego |
Restore grayscale decoding support with FFmpeg.
|
| Sat, 12 Apr 2008 23:28:11 +0000 |
diego |
Fix MPDEPEND_CMD to work with more than one subdirectory level.
|
| Sat, 12 Apr 2008 22:42:00 +0000 |
diego |
Backport SSE2-optimized IDCT routines from upstream libmpeg2.
|
| Sat, 12 Apr 2008 22:01:16 +0000 |
diego |
wording improvements suggested by the Wanderer
|
| Sat, 12 Apr 2008 20:36:57 +0000 |
nicodvb |
removed useless parameter :type from -dvbin (the frontend type is reported by the card)
|
| Sat, 12 Apr 2008 20:30:36 +0000 |
nicodvb |
removed defunct options :vid and :aid from -dvbin (they were useless from the start)
|
| Sat, 12 Apr 2008 18:35:11 +0000 |
zuxy |
Oops...should be "drv43260.dll" instead of "drv34260.dll"
|
| Sat, 12 Apr 2008 18:31:08 +0000 |
zuxy |
Cosmetic fix for r26419
|
| Sat, 12 Apr 2008 18:29:57 +0000 |
zuxy |
Dlls can be relocated when loading so rely on filename instead of absolute
|
| Sat, 12 Apr 2008 18:24:25 +0000 |
zuxy |
Indentation fix for r26417
|
| Sat, 12 Apr 2008 18:23:26 +0000 |
zuxy |
Don't print "Could not patch" messages when we haven't actually tried to patch.
|
| Sat, 12 Apr 2008 18:19:51 +0000 |
zuxy |
Check for drvc.dll entries for mingw32
|
| Sat, 12 Apr 2008 16:23:43 +0000 |
diego |
Ignore dependency files.
|
| Sat, 12 Apr 2008 16:03:07 +0000 |
diego |
Make include paths consistent; do not use ../ in them.
|
| Sat, 12 Apr 2008 15:51:15 +0000 |
uau |
demux_real.c: Always use MP_NOPTS_VALUE for unknown pts
|
| Sat, 12 Apr 2008 15:51:11 +0000 |
uau |
demux_mkv.c: Mark some static tables const
|
| Sat, 12 Apr 2008 15:51:08 +0000 |
uau |
Reformat demuxer.c
|
| Sat, 12 Apr 2008 15:51:05 +0000 |
uau |
Remove global demuxer_type
|
| Sat, 12 Apr 2008 15:51:02 +0000 |
uau |
subreader.c: remove unused code
|
| Sat, 12 Apr 2008 15:16:37 +0000 |
reimar |
Remove another two useless special-case from flac metadata reading function
|
| Sat, 12 Apr 2008 15:14:02 +0000 |
reimar |
Simplify: use AV_RB24
|
| Sat, 12 Apr 2008 15:11:03 +0000 |
reimar |
Remove useless checks
|
| Sat, 12 Apr 2008 15:09:40 +0000 |
reimar |
Simplify (currently disabled) get_flac_metadata
|
| Sat, 12 Apr 2008 13:19:35 +0000 |
diego |
Update include paths to account for build system changes.
|
| Sat, 12 Apr 2008 13:13:27 +0000 |
diego |
typo fixes
|
| Sat, 12 Apr 2008 12:51:07 +0000 |
zuxy |
Enable runtime control for colorful and/or module name output
|
| Fri, 11 Apr 2008 23:06:33 +0000 |
uau |
Remove unused function demux_read_data_pack
|
| Fri, 11 Apr 2008 23:06:30 +0000 |
uau |
Makefile: Fix compilation on systems with dvb support
|
| Fri, 11 Apr 2008 17:45:17 +0000 |
diego |
Remove unused make variable.
|
| Fri, 11 Apr 2008 17:45:02 +0000 |
diego |
Merge ./gui/Makefile into ./Makefile, one less instance of recursive make.
|
| Fri, 11 Apr 2008 16:55:27 +0000 |
diego |
Add gui/ prefix to some #include paths so that compilation from the
|
| Fri, 11 Apr 2008 10:51:36 +0000 |
diego |
Add GUI_GTK make variable.
|
| Fri, 11 Apr 2008 10:35:32 +0000 |
diego |
typo in filename
|
| Fri, 11 Apr 2008 10:34:26 +0000 |
diego |
Remove duplicate #include.
|
| Fri, 11 Apr 2008 09:50:24 +0000 |
diego |
Update comment to account for renamed header file.
|
| Fri, 11 Apr 2008 09:48:36 +0000 |
diego |
Split cfg-common.h into two separate header files. It was being included twice
|
| Fri, 11 Apr 2008 08:18:28 +0000 |
diego |
Ahem, libmenu objects should only be compiled when OSD menu is enabled.
|
| Fri, 11 Apr 2008 08:13:36 +0000 |
diego |
vf_pp7 does not depend on libavcodec.
|
| Fri, 11 Apr 2008 08:11:16 +0000 |
diego |
vf_screenshot depends on libavcodec.
|
| Fri, 11 Apr 2008 07:39:49 +0000 |
diego |
Remove unused TARGET_WIN32 setting.
|
| Fri, 11 Apr 2008 07:37:27 +0000 |
diego |
Remove Win32 linker option for netstream. Other winsock using code does not
|
| Fri, 11 Apr 2008 07:28:32 +0000 |
diego |
Add a config.mak variable to control compilation of the Win32 GUI.
|
| Fri, 11 Apr 2008 07:17:40 +0000 |
diego |
Remove unused definition.
|
| Thu, 10 Apr 2008 21:01:53 +0000 |
rtogni |
Support for vorbis.acm decoder (used for some implementations of vorbis
|
| Thu, 10 Apr 2008 10:55:39 +0000 |
ptt |
if it's 'for lang in...' it's better off to use $$lang as a variable next ;)
|
| Thu, 10 Apr 2008 10:01:54 +0000 |
diego |
Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.
|
| Wed, 09 Apr 2008 21:49:27 +0000 |
rtogni |
1000l fix linking after r26378
|
| Wed, 09 Apr 2008 20:53:11 +0000 |
compn |
document ignore option
|
| Wed, 09 Apr 2008 18:33:26 +0000 |
diego |
10l: libass compilation should be conditional.
|
| Wed, 09 Apr 2008 18:26:44 +0000 |
diego |
Rename ASS make variable to LIBASS.
|
| Wed, 09 Apr 2008 18:20:22 +0000 |
diego |
Remove useless #include.
|
| Wed, 09 Apr 2008 18:15:21 +0000 |
diego |
Merge libaf/Makefile into Makefile, one less instance of recursive make.
|
| Wed, 09 Apr 2008 18:05:57 +0000 |
diego |
Remove some useless quotes from #error preprocessor directives.
|
| Wed, 09 Apr 2008 18:02:05 +0000 |
diego |
Use quotes instead of angular brackets for local includes.
|
| Wed, 09 Apr 2008 17:23:59 +0000 |
diego |
Handle af_ladspa conditional compilation in the usual way.
|
| Wed, 09 Apr 2008 17:14:43 +0000 |
diego |
Remove -I CFLAGS hack, -I../libavcodec is no longer in CFLAGS.
|
| Wed, 09 Apr 2008 17:03:08 +0000 |
diego |
Do not build subrip with debugging symbols.
|
| Wed, 09 Apr 2008 17:02:22 +0000 |
diego |
cosmetics: Group dependency declarations together.
|
| Wed, 09 Apr 2008 17:00:42 +0000 |
diego |
Remove redundant compilation commands that shadow builtin rules.
|
| Wed, 09 Apr 2008 16:54:49 +0000 |
diego |
List libraries to link to in dependency list.
|
| Wed, 09 Apr 2008 16:50:30 +0000 |
diego |
cosmetics: Add CFLAGS to compilation commands everywhere.
|
| Wed, 09 Apr 2008 16:42:18 +0000 |
diego |
Remove unnecessary ../libmpcodecs/img_format.o from list subrip objects.
|
| Wed, 09 Apr 2008 16:39:07 +0000 |
diego |
Update for latest changes to linking dependencies.
|
| Wed, 09 Apr 2008 15:19:55 +0000 |
diego |
Add missing #includes to pass 'make checkheaders' to codecs.conf.h.
|
| Wed, 09 Apr 2008 14:13:30 +0000 |
diego |
Restore osdep/mmap-os2.c compilation, which was accidentally removed.
|
| Wed, 09 Apr 2008 12:54:07 +0000 |
diego |
cosmetics: Align columns.
|
| Wed, 09 Apr 2008 11:31:50 +0000 |
diego |
Fix nonsensical license header, mpeg2dec is not GNU Make.
|
| Wed, 09 Apr 2008 00:46:21 +0000 |
albeu |
Split the lavf taglists out of the lavf muxer to allow using libmpmux
|
| Wed, 09 Apr 2008 00:43:19 +0000 |
albeu |
Split the aac header parsing out of aac demuxer to allow using libmpmux
|
| Wed, 09 Apr 2008 00:36:28 +0000 |
albeu |
Remove the need for code using stream to export an mp_input_check_interrupt()
|
| Wed, 09 Apr 2008 00:32:35 +0000 |
albeu |
Make stream independent of libmpdemux, the asf demuxer and streaming
|
| Tue, 08 Apr 2008 22:25:59 +0000 |
diego |
Merge libass/Makefile into Makefile, one less recursive make directory.
|
| Tue, 08 Apr 2008 22:11:17 +0000 |
diego |
cosmetics: Rename some shell variables to give them more descriptive names.
|
| Tue, 08 Apr 2008 22:08:23 +0000 |
diego |
cosmetics: Merge shell commands into one line.
|
| Tue, 08 Apr 2008 22:07:03 +0000 |
diego |
Do not suppress command output.
|
| Tue, 08 Apr 2008 18:25:30 +0000 |
diego |
Merge osdep/Makefile into the top-level Makefile, thus getting rid
|
| Tue, 08 Apr 2008 18:03:14 +0000 |
diego |
Move decision about which getch2 and timer file to compile to configure.
|
| Tue, 08 Apr 2008 17:31:25 +0000 |
diego |
Move decision about whether or not to compile osdep/mmap_os2.c to configure.
|
| Tue, 08 Apr 2008 17:06:25 +0000 |
diego |
Merge simplifications from FFmpeg r12764.
|
| Mon, 07 Apr 2008 23:49:39 +0000 |
diego |
Fix FFmpeg DEPEND_CMD to account for latest changes and add MPDEPEND_CMD.
|
| Mon, 07 Apr 2008 22:25:13 +0000 |
diego |
Sync with FFmpeg's shiny new non-recursive build system.
|
| Mon, 07 Apr 2008 21:16:50 +0000 |
mru |
non-recursive makefiles
|
| Mon, 07 Apr 2008 17:39:41 +0000 |
reimar |
reset() should not senselessly close and reopen
|
| Mon, 07 Apr 2008 17:32:44 +0000 |
reimar |
AUDIO_DRAIN makes no sense directly after opening
|
| Mon, 07 Apr 2008 08:28:54 +0000 |
diego |
Build all parts in the libmenu subdirectory nonrecursively.
|
| Mon, 07 Apr 2008 07:55:05 +0000 |
diego |
There is no more need to ignore .depend and libinput.a.
|
| Mon, 07 Apr 2008 07:46:32 +0000 |
diego |
According to the Icon Theme Specification icon names should have no extension.
|
| Sun, 06 Apr 2008 23:09:06 +0000 |
diego |
Get rid of recursive make for the input/ subdirectory.
|
| Sun, 06 Apr 2008 23:08:15 +0000 |
diego |
Update Makefile to account for native/RTjpegN.c --> native/rtjpegn.c renaming.
|
| Sun, 06 Apr 2008 21:56:11 +0000 |
diego |
Use DEPEND_CMD as set by configure to generate dependency information instead
|
| Sun, 06 Apr 2008 21:52:50 +0000 |
diego |
100l: Revert previous accidental commit.
|
| Sun, 06 Apr 2008 18:17:59 +0000 |
diego |
Rename RTJPEG files so that filenames consist of lowercase name only.
|
| Sun, 06 Apr 2008 13:38:46 +0000 |
compn |
add dvcpro 50 in mov fourcc, patch by j _ta_ v2v.cc
|
| Sat, 05 Apr 2008 19:33:05 +0000 |
Gabrov |
synced with r26333
|
| Sat, 05 Apr 2008 16:29:10 +0000 |
diego |
Add multiple inclusion guards to help_mp.h.
|
| Sat, 05 Apr 2008 16:19:10 +0000 |
diego |
Use the more natural ">" instead of "1>" for stdout redirection.
|
| Sat, 05 Apr 2008 14:11:48 +0000 |
reimar |
Fix lots and lots of other demuxers broken by r26301
|
| Sat, 05 Apr 2008 14:07:34 +0000 |
reimar |
Remove another useless cast
|
| Sat, 05 Apr 2008 14:07:05 +0000 |
reimar |
Remove useless cast
|
| Sat, 05 Apr 2008 11:09:21 +0000 |
reimar |
Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder
|
| Sat, 05 Apr 2008 09:19:55 +0000 |
reimar |
Set demuxer->audio->id to avoid breakage due to r26301
|
| Sat, 05 Apr 2008 08:49:07 +0000 |
reimar |
Set correct codec tag for raw rgb in mov, fixes
|
| Fri, 04 Apr 2008 19:38:06 +0000 |
diego |
Export some more information for FFmpeg's buid system.
|
| Fri, 04 Apr 2008 01:24:40 +0000 |
compn |
add switch_aspect cycle wish
|
| Fri, 04 Apr 2008 01:09:36 +0000 |
iive |
Change I_TYPE -> FF_I_TYPE to fix compilation.
|
| Thu, 03 Apr 2008 17:19:23 +0000 |
reimar |
Change I_TYPE -> FF_I_TYPE to fix compilation.
|
| Thu, 03 Apr 2008 16:57:16 +0000 |
reimar |
Better mark variables that are changed by the signal handler as volatile
|
| Wed, 02 Apr 2008 01:01:22 +0000 |
uau |
Add some const qualifiers to reduce warnings
|
| Tue, 01 Apr 2008 22:00:54 +0000 |
diego |
Remove now useless PARTS-yes line.
|
| Tue, 01 Apr 2008 21:59:39 +0000 |
diego |
Darwin and Win32 DVD support libs are handled separately, take them back
|
| Tue, 01 Apr 2008 21:22:02 +0000 |
diego |
Initialize _dvdread variable to "no" in the dvdread check.
|
| Tue, 01 Apr 2008 17:42:16 +0000 |
diego |
Remove pointless comments from local diff.
|
| Tue, 01 Apr 2008 17:41:18 +0000 |
diego |
cosmetics: Fix some typos and trailing whitespace in local changes.
|
| Tue, 01 Apr 2008 17:31:37 +0000 |
diego |
Revert local changes that pointlessly add #ifdefs all over libmpeg2 to disable
|
| Tue, 01 Apr 2008 15:24:53 +0000 |
uau |
Remove unnecessary includes
|
| Tue, 01 Apr 2008 14:19:45 +0000 |
diego |
Do not #include libavutil/common.h. It is not used directly and mpbswap.h
|
| Mon, 31 Mar 2008 17:48:50 +0000 |
diego |
Ahem, fix quoting of $ in DEPEND_CMD.
|
| Mon, 31 Mar 2008 17:27:01 +0000 |
diego |
Add DEPEND_CMD to config.mak (sync with FFmpeg).
|
| Mon, 31 Mar 2008 17:19:51 +0000 |
diego |
Rename HAVE_XVMC_ACCEL to HAVE_XVMC for consistency and to sync with FFmpeg.
|
| Mon, 31 Mar 2008 17:04:06 +0000 |
diego |
cosmetics: Group all FFmpeg settings together in config.mak.
|
| Mon, 31 Mar 2008 16:53:14 +0000 |
diego |
HAVE_MLIB was renamed to CONFIG_MLIB in FFmpeg.
|
| Mon, 31 Mar 2008 16:20:08 +0000 |
diego |
We currently use %U as argument to the Exec entry to indicate that gmplayer
|
| Mon, 31 Mar 2008 04:10:54 +0000 |
uau |
command.h: Remove unnecessary includes
|
| Mon, 31 Mar 2008 04:10:51 +0000 |
uau |
mp_core.h: Fix use of 'mp_image_t' without definition
|
| Sun, 30 Mar 2008 17:42:19 +0000 |
eugeni |
Case insensitive parsing of SSA/ASS section headers.
|
| Sun, 30 Mar 2008 17:42:17 +0000 |
eugeni |
Skip BOM at the beginning of text in ASS parser.
|
| Sun, 30 Mar 2008 16:55:46 +0000 |
eugeni |
Support 'default' attribute for audio and subtitle tracks.
|
| Sat, 29 Mar 2008 15:51:05 +0000 |
diego |
Fix wrong #endif comment.
|
| Sat, 29 Mar 2008 11:35:29 +0000 |
reimar |
Fix possible integer overflow in malloc by using calloc instead.
|
| Fri, 28 Mar 2008 14:02:53 +0000 |
ptt |
synced with r26297
|
| Fri, 28 Mar 2008 13:59:58 +0000 |
ptt |
compacted new libavformat's 'ipod' description
|
| Fri, 28 Mar 2008 08:30:53 +0000 |
reimar |
Handle property commands in idle mode.
|
| Fri, 28 Mar 2008 01:07:59 +0000 |
uau |
Include some .h files in corresponding .c files
|
| Thu, 27 Mar 2008 19:58:00 +0000 |
ptt |
synced with r26073
|
| Thu, 27 Mar 2008 19:48:06 +0000 |
ptt |
it's synced with r23520
|
| Thu, 27 Mar 2008 19:44:30 +0000 |
ptt |
it's synced with r26258
|
| Thu, 27 Mar 2008 19:36:48 +0000 |
ptt |
it's synced with r24035
|
| Thu, 27 Mar 2008 19:35:13 +0000 |
ptt |
it's synced with r25566
|
| Thu, 27 Mar 2008 19:33:54 +0000 |
ptt |
it's synced with 26146
|
| Thu, 27 Mar 2008 19:32:05 +0000 |
ptt |
synced with 23516 (it was already ok)
|
| Thu, 27 Mar 2008 19:21:43 +0000 |
ptt |
remove excessive space character
|
| Thu, 27 Mar 2008 19:10:00 +0000 |
ptt |
grammar fix
|
| Thu, 27 Mar 2008 18:38:38 +0000 |
ptt |
38% synced with r22753
|
| Thu, 27 Mar 2008 11:19:11 +0000 |
diego |
cosmetics: prettyprinting
|
| Thu, 27 Mar 2008 11:18:09 +0000 |
diego |
some more DragonFly BSD changes, patch by Hasso Tepper, hasso estpak ee
|
| Thu, 27 Mar 2008 08:42:09 +0000 |
ptt |
better explanation and grammar fix
|
