Sat, 05 Jun 2010 06:41:43 +0000 |
reimar |
Sync libdvdcss with their latest SVN.
|
Sat, 05 Jun 2010 06:28:58 +0000 |
reimar |
Add support for -geometry x syntax since the documentation claims
|
Fri, 04 Jun 2010 18:46:22 +0000 |
reimar |
Do not use libass functions if it is disabled.
|
Fri, 04 Jun 2010 17:11:56 +0000 |
reimar |
Default to -correct-pts off if -fps was given, since -fps has no effect
|
Fri, 04 Jun 2010 17:10:38 +0000 |
reimar |
Force window placement also if -xineramascreen was set >= 0,
|
Thu, 03 Jun 2010 21:50:08 +0000 |
siretart |
apply missing bits from http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4
|
Thu, 03 Jun 2010 21:01:37 +0000 |
reimar |
Try always enabling correct pts again for lavf demuxer, since the know
|
Thu, 03 Jun 2010 20:59:40 +0000 |
reimar |
Limit buffered PTS only when we actually got a frame from the decoder.
|
Thu, 03 Jun 2010 20:39:41 +0000 |
reimar |
If an invalid pts value is detected, try to to make up some if it seems
|
Thu, 03 Jun 2010 17:37:58 +0000 |
siretart |
vo_yuv4mpeg: disable RGB support when compiling against a shared libswscale
|
Thu, 03 Jun 2010 08:17:51 +0000 |
cehoyos |
Simplify libass version check.
|
Thu, 03 Jun 2010 08:17:10 +0000 |
cehoyos |
Raise LIBASS_VERSION, forgotten in r31293.
|
Wed, 02 Jun 2010 22:09:04 +0000 |
reimar |
Add the -march fallback for amdfam10 also to the x86_64 case.
|
Wed, 02 Jun 2010 20:50:55 +0000 |
cehoyos |
libavcodec/libx264.c requires x264 0.98 since r23430.
|
Wed, 02 Jun 2010 20:21:29 +0000 |
cehoyos |
Fix compilation with external libass.
|
Wed, 02 Jun 2010 20:12:50 +0000 |
cehoyos |
ass_set_aspect_ratio() takes three arguments since 0x00907010.
|
Tue, 01 Jun 2010 21:07:02 +0000 |
siretart |
avoid using swscale internals by copying in palette8torbg16 and its bgr variant
|
Tue, 01 Jun 2010 20:12:58 +0000 |
reimar |
Extend geometry parsing to reject all invalid strings.
|
Tue, 01 Jun 2010 19:35:16 +0000 |
siretart |
deprecate palette8topacked32 in favor of public API functions sws_convertPalette8ToPacked32 and -24
|
Tue, 01 Jun 2010 11:30:07 +0000 |
stefano |
Move internal scale context fields initialization from
|
Tue, 01 Jun 2010 10:28:45 +0000 |
cehoyos |
Fix compilation after FFmpeg r23402.
|
Tue, 01 Jun 2010 06:53:56 +0000 |
siretart |
remove palette8torgb15 and palette8tobgr15
|
Mon, 31 May 2010 21:24:00 +0000 |
reimar |
Factor out some common code and ensure we will not try to draw OSD
|
Mon, 31 May 2010 21:16:02 +0000 |
reimar |
Reindent.
|
Mon, 31 May 2010 21:15:20 +0000 |
reimar |
Fix subtitle display for http://samples.mplayerhq.hu/sub/largeres_vobsub.mkv
|
Mon, 31 May 2010 19:44:02 +0000 |
aurel |
Switch mkv demuxing to lavf by default.
|
Mon, 31 May 2010 19:10:57 +0000 |
aurel |
backport ass_flush_events() from upstream libass and make use of it
|
Mon, 31 May 2010 17:12:27 +0000 |
reimar |
Extend the range of the -a52drc range up to two, as a experimental feature
|
Sun, 30 May 2010 22:14:13 +0000 |
diego |
Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.
|
Sun, 30 May 2010 22:11:32 +0000 |
Gabrov |
synced with r31289
|
Sun, 30 May 2010 19:14:18 +0000 |
reimar |
Change code to let Window Manager chose window location by default.
|
Sun, 30 May 2010 16:50:02 +0000 |
reimar |
Add a referrer option to set the HTTP Referer field.
|
Sun, 30 May 2010 16:48:18 +0000 |
reimar |
Forgotten part of previous commit (extern declaration of drc_level).
|
Sun, 30 May 2010 16:46:31 +0000 |
reimar |
Use the -a52drc option also for the libavcodec decoder.
|
Sun, 30 May 2010 14:29:18 +0000 |
cehoyos |
Fix compilation without librtmp.
|
Sun, 30 May 2010 13:51:24 +0000 |
reimar |
Treat a NULL renderer string as indication for software renderer.
|
Sun, 30 May 2010 13:50:14 +0000 |
reimar |
Prefer -vo sdl over "probably software" OpenGL.
|
Sun, 30 May 2010 12:14:40 +0000 |
reimar |
Change compiler argument order for compile_check to avoid incorrect linking
|
Sun, 30 May 2010 10:01:40 +0000 |
reimar |
Make 3dnow and MMX code compile for 64 bit (just stupid search-and-replace).
|
Sun, 30 May 2010 09:47:53 +0000 |
diego |
Add codec-cfg.h to the dependency list of codec-cfg.
|
Sun, 30 May 2010 08:44:05 +0000 |
diego |
Rename yuv2rgb_template2.c --> yuv2rgb_template.c now that the other is gone.
|
Sun, 30 May 2010 08:31:23 +0000 |
diego |
Remove GPL-licensed YUV to RGB MMX routines.
|
Sun, 30 May 2010 05:16:29 +0000 |
hyc |
Add librtmp support
|
Sat, 29 May 2010 22:22:07 +0000 |
diego |
Cast void* pointer to appropriate type before using it in an addition; fixes
|
Sat, 29 May 2010 22:17:26 +0000 |
diego |
Update 1.0rc3 release name and date.
|
Sat, 29 May 2010 22:04:35 +0000 |
siretart |
minor spelling fixes
|
Sat, 29 May 2010 22:02:25 +0000 |
siretart |
add myself to the AUTHORS file
|
Sat, 29 May 2010 16:34:01 +0000 |
reimar |
Use edi instead of ebx to avoid issues with PIC.
|
Sat, 29 May 2010 15:07:16 +0000 |
reimar |
Remove obsolete may_alias-related defines, lavu handles this now
|
Sat, 29 May 2010 14:57:17 +0000 |
reimar |
Actually run a detection whether external libass exists, instead
|
Sat, 29 May 2010 14:44:02 +0000 |
reimar |
Fix compilation if the compiler does not support -march=amdfam10
|
Sat, 29 May 2010 10:43:51 +0000 |
diego |
cosmetics: Drop leading '_' from noinputmodules variable.
|
Sat, 29 May 2010 10:13:39 +0000 |
diego |
misc cosmetics: K&R style nits, #include placement, indentation
|
Sat, 29 May 2010 10:11:55 +0000 |
diego |
Mark key_type structure as const.
|
Sat, 29 May 2010 10:10:30 +0000 |
diego |
getch2-os2.c: Add #include for the header that declares the public functions.
|
Sat, 29 May 2010 10:07:10 +0000 |
diego |
cosmetics: Remove some commented-out #includes, fix a comment grammar error.
|
Sat, 29 May 2010 10:06:29 +0000 |
diego |
Directly mark jpeg_buf_src() as void instead of using some indirection marcro.
|
Fri, 28 May 2010 21:03:29 +0000 |
compn |
add "lpcJ" fourcc for the RealAudio 1.0 codec.
|
Fri, 28 May 2010 20:59:53 +0000 |
reimar |
Fix typo in message.
|
Fri, 28 May 2010 18:49:02 +0000 |
reimar |
stream_check_interrupt should sleep even if no callback is set.
|
Fri, 28 May 2010 18:47:03 +0000 |
reimar |
100l, stream_check_for_interrupt argument is not in usec,
|
Fri, 28 May 2010 18:45:25 +0000 |
reimar |
Document time scale for stream_check_interrupt argument.
|
Fri, 28 May 2010 18:44:41 +0000 |
reimar |
Document thatg time argument is in milliseconds.
|
Fri, 28 May 2010 17:26:31 +0000 |
reimar |
Improve handling of cache process/thread hanging/being killed.
|
Fri, 28 May 2010 16:57:16 +0000 |
reimar |
Fix cache process accidentally being killed by SIGUSR1.
|
Fri, 28 May 2010 11:52:12 +0000 |
cehoyos |
Use MSGT_DECVIDEO in a video decoder.
|
Fri, 28 May 2010 08:39:02 +0000 |
diego |
Remove commented-out declaration of nonexisting function uGetTimer().
|
Fri, 28 May 2010 00:25:28 +0000 |
diego |
Drop pointless _t suffix from 'struct lavf_priv'.
|
Thu, 27 May 2010 23:36:03 +0000 |
diego |
Drop pointles _st suffix from struct mp_cmd_filter and mp_cmd_bind_section.
|
Thu, 27 May 2010 23:21:16 +0000 |
diego |
cosmetics: vertical alignment in msg module help output.
|
Thu, 27 May 2010 22:43:49 +0000 |
diego |
vf_yuy2 was removed after the 1.0rc3 branch was cut.
|
Thu, 27 May 2010 22:43:14 +0000 |
diego |
small cosmetics for the 1.0rc3 changelog
|
Thu, 27 May 2010 22:18:10 +0000 |
diego |
Fix a bunch of typos in the stream cache code.
|
Thu, 27 May 2010 20:59:40 +0000 |
diego |
Drop pointless _s suffix from 'struct af_stream'.
|
Thu, 27 May 2010 20:38:25 +0000 |
diego |
Drop pointless _st suffix from 'struct stream'.
|
Thu, 27 May 2010 18:15:04 +0000 |
diego |
Drop pointless _s suffix from struct ao_data.
|
Thu, 27 May 2010 16:46:47 +0000 |
diego |
cosmetics: Reformat in K&R coding style.
|
Thu, 27 May 2010 16:13:53 +0000 |
diego |
Remove two pointless void* casts.
|
Thu, 27 May 2010 16:05:30 +0000 |
diego |
Remove unnecessary demux_mkv_seek() forward declaration.
|
Thu, 27 May 2010 10:10:27 +0000 |
diego |
cosmetics: Drop pointless _s suffix from 'struct ad_functions'.
|
Thu, 27 May 2010 10:08:30 +0000 |
diego |
cosmetics: Drop pointless _s suffix from 'struct mp_image'.
|
Thu, 27 May 2010 09:59:15 +0000 |
diego |
cosmetics: Drop _s suffix from 'struct vd_functions'.
|
Thu, 27 May 2010 09:54:37 +0000 |
diego |
cosmetics: K&R coding style
|
Thu, 27 May 2010 09:54:11 +0000 |
diego |
cosmetics: K&R coding style
|
Wed, 26 May 2010 18:23:43 +0000 |
reimar |
Retry reading even if we hit eof before.
|
Wed, 26 May 2010 18:01:38 +0000 |
reimar |
Switch ogg demuxing to lavf by default.
|
Wed, 26 May 2010 17:56:11 +0000 |
reimar |
Re-enable wakeup-on-signal for cache process.
|
Wed, 26 May 2010 17:27:38 +0000 |
reimar |
Disable waking the cache process up via a signal, it
|
Wed, 26 May 2010 10:05:36 +0000 |
cehoyos |
Both XVID and VDPAU decode our SIPP sample better than current libavcodec.
|
Wed, 26 May 2010 00:47:22 +0000 |
diego |
Add missing RGB12 version of the fast OSD table.
|
Tue, 25 May 2010 23:41:30 +0000 |
diego |
Add support for decoding VP8 through libvpx wrapper in FFmpeg.
|
Tue, 25 May 2010 23:09:20 +0000 |
diego |
Remove obsolete new policy proposal draft from Michael.
|
Tue, 25 May 2010 23:07:28 +0000 |
hyc |
Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
|
Tue, 25 May 2010 11:39:58 +0000 |
diego |
whitespace cosmetics
|
Tue, 25 May 2010 11:37:53 +0000 |
diego |
whitespace cosmetics: fix indentation
|
Tue, 25 May 2010 11:36:55 +0000 |
diego |
cosmetics: vertical alignment in msg module help output
|
Tue, 25 May 2010 11:35:56 +0000 |
diego |
Remove some commented-out duplicate option entries.
|
Tue, 25 May 2010 11:34:38 +0000 |
diego |
K&R cosmetics: Fix '*' placement.
|
Tue, 25 May 2010 11:32:32 +0000 |
diego |
Remove unused forward declarations.
|
Tue, 25 May 2010 10:32:09 +0000 |
cehoyos |
Samsung uses SIPP as FourCC for MPEG-4 ASP.
|
Mon, 24 May 2010 21:13:22 +0000 |
siretart |
support linking to fribidi without pkg-config
|
Mon, 24 May 2010 19:32:17 +0000 |
siretart |
make configure use pkg-config for fribidi checks
|
Mon, 24 May 2010 17:51:15 +0000 |
reimar |
Change -vo md5sum to not interleave U and V lines when calculating
|
Mon, 24 May 2010 17:36:23 +0000 |
reimar |
Fix OpenGL autodetection to not leave values at -1.
|
Sun, 23 May 2010 23:24:25 +0000 |
reimar |
Avoid decoding of 0-size packets. This also fixes that the main loop believes
|
Sun, 23 May 2010 23:22:25 +0000 |
reimar |
Use MP_NOPTS_VALUE as "default" pts for delayed frames instead of some
|
Sun, 23 May 2010 22:26:10 +0000 |
reimar |
Slightly reduce number of #ifs
|
Sun, 23 May 2010 22:09:40 +0000 |
reimar |
Use an extra define to simplify ifdefs
|
Sun, 23 May 2010 22:04:01 +0000 |
reimar |
Try reducing the #ifdef mess for the different cache variants.
|
Sun, 23 May 2010 21:58:50 +0000 |
reimar |
Extract the cache main loop into a separate function.
|
Sun, 23 May 2010 21:56:22 +0000 |
diego |
Remove ambiguous language about indenting if-blocks.
|
Sun, 23 May 2010 21:53:48 +0000 |
reimar |
Optimize cache behaviour for the many-consecutive-seeks case.
|
Sun, 23 May 2010 19:49:28 +0000 |
reimar |
Add code to wake up cache process when e.g. a seek is needed.
|
Sun, 23 May 2010 17:05:55 +0000 |
sesse |
Add ChangeLog entry about CineForm support.
|
Sun, 23 May 2010 16:01:12 +0000 |
sesse |
Add final missing bits of CineForm HD support on Linux (via the Windows
|
Sun, 23 May 2010 15:50:49 +0000 |
diego |
Remove unused function MODULE_DecRefCount(), fixes the warning:
|
Sun, 23 May 2010 15:07:34 +0000 |
diego |
K&R coding style should be applied to new code.
|
Sun, 23 May 2010 14:15:27 +0000 |
diego |
cosmetics: reformat ad_pcm.c in K&R style
|
Sun, 23 May 2010 10:02:30 +0000 |
stefano |
Add empty newline to separate function declarations, for better
|
Sat, 22 May 2010 16:32:39 +0000 |
cehoyos |
Ignore (but print out) offset with libtheora decoder.
|
Sat, 22 May 2010 01:17:59 +0000 |
cehoyos |
Do not use correct-pts for mpeg-ps: It breaks PAFF samples.
|
Fri, 21 May 2010 17:19:01 +0000 |
reimar |
Change WAV header updating in ao_pcm to allow to up to almost 4GB size.
|
Fri, 21 May 2010 11:20:23 +0000 |
jrash |
sync with en/mplayer.1 rev. 31173
|
Thu, 20 May 2010 23:17:41 +0000 |
iive |
Fix compilation broken by FFmpeg-r23201 that changed the api of error logging.
|
Wed, 19 May 2010 22:56:41 +0000 |
stefano |
Cosmetics: make more compact the code for handle_jpeg(), this also allows
|
Wed, 19 May 2010 22:49:04 +0000 |
stefano |
Remove PI definition and use M_PI instead.
|
Wed, 19 May 2010 17:58:17 +0000 |
reimar |
Do not return pointer to on-stack memory.
|
Wed, 19 May 2010 17:55:39 +0000 |
reimar |
Fix return value (it was missing completely).
|
Wed, 19 May 2010 17:53:47 +0000 |
reimar |
Handle -wid Window being closed for direct3d and gl vos on Windows.
|
Wed, 19 May 2010 13:31:11 +0000 |
lorenm |
13% faster yuv420 to rgb15 mmx.
|
Wed, 19 May 2010 08:21:56 +0000 |
lorenm |
40% faster yuv420 to rgb24 mmx.
|
Fri, 14 May 2010 18:00:04 +0000 |
reimar |
Quit MPlayer if we receive a DestroyNotify event.
|
Fri, 14 May 2010 16:56:43 +0000 |
diego |
vf_zr requires the lavc MJPEG encoder even when MEncoder has been disabled.
|
Fri, 14 May 2010 16:13:53 +0000 |
diego |
Remove duplicate and nonsense libavencoders #define for OpenCORE AMR-WB.
|
Fri, 14 May 2010 15:34:30 +0000 |
diego |
Check for termios.h before sys/termios.h.
|
Fri, 14 May 2010 14:24:16 +0000 |
cehoyos |
Enable libavcodecs new MPEG-1 Audio float decoder.
|
Fri, 14 May 2010 14:20:19 +0000 |
cehoyos |
Fix compilation after r31173.
|
Fri, 14 May 2010 13:49:05 +0000 |
siretart |
remove vf_yuy2, functionality is replaced by -vf format=yuv2
|
Thu, 13 May 2010 20:48:55 +0000 |
cehoyos |
Silence a gcc warning about char trying to be packed.
|
Thu, 13 May 2010 18:11:45 +0000 |
compn |
move 'dvdsublang... moviename en,eng,' message to debug level.
|
Wed, 12 May 2010 20:47:32 +0000 |
ramiro |
Revert r31153. It failed to build on:
|
Wed, 12 May 2010 08:29:55 +0000 |
diego |
Mention removal of internal liba52 copy in Changelog.
|
Tue, 11 May 2010 22:31:47 +0000 |
diego |
10l: Use the directory part of the stylesheet path to create a directory.
|
Tue, 11 May 2010 21:33:15 +0000 |
diego |
cosmetics: Invoke all shell scripts during XML documentation build directly.
|
Tue, 11 May 2010 21:31:36 +0000 |
diego |
Create output directory when copying stylesheet.
|
Tue, 11 May 2010 21:25:12 +0000 |
diego |
Merge both XML documentation README files into one.
|
Tue, 11 May 2010 21:21:45 +0000 |
diego |
Do not run xmllint prior to building the XML documentation.
|
Tue, 11 May 2010 14:27:26 +0000 |
diego |
XML docs: Make xmllint-* targets a dependency of html-chunked-*/html-single-*.
|
Tue, 11 May 2010 13:27:13 +0000 |
diego |
Only mark targets whose names end in "clean" as phony.
|
Tue, 11 May 2010 13:17:26 +0000 |
diego |
docs: Update documentation to account for recent build system changes.
|
Tue, 11 May 2010 13:13:32 +0000 |
diego |
Make XML documentation build process nonrecursive.
|
Tue, 11 May 2010 11:52:41 +0000 |
diego |
Get rid of pointless variable indirection for XSL stylesheets.
|
Tue, 11 May 2010 11:13:07 +0000 |
diego |
libdvdcss is now synced to a recent upstream Subversion snapshot.
|
Tue, 11 May 2010 11:10:28 +0000 |
diego |
libdvdcss: Fix potential format string crash; check RPC status on disc access.
|
Tue, 11 May 2010 10:58:50 +0000 |
diego |
libdvdcss: OS/2 support; this merges upstream revisions 220 and 229.
|
Tue, 11 May 2010 10:51:46 +0000 |
diego |
libdvdcss: cosmetics: Fix FSF address and program name in license headers.
|
Tue, 11 May 2010 09:23:31 +0000 |
astrange |
Fix compilation with --disable-fastmemcpy on x86
|
Tue, 11 May 2010 00:36:34 +0000 |
ramiro |
Use int instead of long to pass width parameters in non-public functions.
|
Mon, 10 May 2010 23:39:16 +0000 |
diego |
Pass a language variable to submakes instead of reading subdirectory Makefiles.
|
Sun, 09 May 2010 21:36:10 +0000 |
reimar |
Default to rectangle=1 on Mesa DRI R200 drivers, much faster and less buggy.
|
Sun, 09 May 2010 21:29:21 +0000 |
reimar |
Minor code cleanup.
|
Sun, 09 May 2010 21:25:38 +0000 |
reimar |
yuv=5 supports brightness and contrast adjustment.
|
Sun, 09 May 2010 20:31:45 +0000 |
compn |
add FLV4 fourcc to vp6
|
Sun, 09 May 2010 14:45:29 +0000 |
diego |
Remove internal liba52 copy.
|
Sun, 09 May 2010 12:28:15 +0000 |
diego |
Use the system liba52 headers when internal liba52 is disabled, fixes:
|
Sun, 09 May 2010 11:20:15 +0000 |
diego |
cosmetics: Drop leading underscore from some commonly-used variable names.
|
Sun, 09 May 2010 00:18:26 +0000 |
reimar |
Handle Y8/Y800 formats more similar to other YUV formats.
|
Sun, 09 May 2010 00:16:46 +0000 |
reimar |
Handle chroma texture size becoming 0, e.g. due to bad rounding.
|
Fri, 07 May 2010 21:59:18 +0000 |
mru |
blackfin: fix yuv422 to yuv420 conversion
|
Fri, 07 May 2010 18:27:46 +0000 |
diego |
Remove references to some long-removed files.
|
Fri, 07 May 2010 18:24:41 +0000 |
diego |
Remove seemingly misplaced and commented-out liba52 #include.
|
Thu, 06 May 2010 10:18:25 +0000 |
cehoyos |
Add support for 12-bit color mode on framebuffer devices.
|
Thu, 06 May 2010 10:10:34 +0000 |
cehoyos |
Fix compilation with old libschroedinger-dev installed.
|
Tue, 04 May 2010 18:46:42 +0000 |
aurel |
cosmetic: typo, this wasn't supposed to be plural
|
Tue, 04 May 2010 11:46:50 +0000 |
diego |
Remove translated strings that are gone from the master translation.
|
Tue, 04 May 2010 09:11:01 +0000 |
diego |
alternative LGPL-licensed, MMX-optimized YUV to RGB conversion routines
|
Mon, 03 May 2010 23:34:38 +0000 |
diego |
the great MPlayer tab removal: part II
|
Mon, 03 May 2010 23:00:58 +0000 |
diego |
Put symlinks under revision control instead of generating them during make.
|
Mon, 03 May 2010 22:45:00 +0000 |
aurel |
print a more detailed and more useful description of each stream with lavf
|
Mon, 03 May 2010 22:40:00 +0000 |
aurel |
10l: correctly use video_stream instead of audio_stream in the video section
|
Mon, 03 May 2010 22:30:06 +0000 |
aurel |
add ID_..._NAME to -identify for each lavf stream which has a title
|
Mon, 03 May 2010 22:19:52 +0000 |
aurel |
uniformize handling of aid and vid with lavf so that it matches handling of sid
|
Sun, 02 May 2010 10:47:40 +0000 |
cehoyos |
Silence permanent warning messages when decoding H264 over rtsp with
|
Sat, 01 May 2010 22:49:05 +0000 |
reimar |
Also print OpenGL renderer string with vendor and version with -v
|
Sat, 01 May 2010 15:38:37 +0000 |
reimar |
Continue probing even for score == AVPROBE_SCORE_MAX / 4 to match
|
Sat, 01 May 2010 13:50:49 +0000 |
reimar |
Use av_probe_input_format2 and avoid accepting detection
|
Fri, 30 Apr 2010 21:18:17 +0000 |
reimar |
Revert accidental change to default CFLAGS.
|
Fri, 30 Apr 2010 19:04:13 +0000 |
reimar |
Add configure detection for SDL backend for -vo gl.
|
Fri, 30 Apr 2010 19:03:13 +0000 |
reimar |
Avoid duplicating the GL/gl.h include.
|
Fri, 30 Apr 2010 17:12:52 +0000 |
reimar |
100l, open the customtex also in binary mode, not just the program.
|
Wed, 28 Apr 2010 11:57:09 +0000 |
cehoyos |
Fix compilation with gcc 2.95.3 (with --disable-ass).
|
Tue, 27 Apr 2010 22:06:29 +0000 |
iive |
New hack for vobsub packet merging.
|