[FFmpeg-devel] [PATCH 9/9] doc/example: Add http multi-client example code

Signed-off-by: Stephan Holljes --- doc/examples/Makefile | 1 + doc/examples/http_multiclient.c | 111 2 files changed, 112 insertions(+) create mode 100644 doc/examples/http_multiclient.c diff --git a/doc/examples/Makefile b/doc/examples/Mak

[FFmpeg-devel] [PATCH 8/9] doc/protocols: document experimental mutli-client api

Signed-off-by: Stephan Holljes --- doc/protocols.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/protocols.texi b/doc/protocols.texi index 453dbcf..39a132a 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -292,6 +292,8 @@ autodetection in the future. If set to 1 enables

Re: [FFmpeg-devel] [PATCH 9/9] Add http multi-client example code

On Fri, Jul 3, 2015 at 12:32 PM, Nicolas George wrote: > Le quintidi 15 messidor, an CCXXIII, Stephan Holljes a écrit : >> Signed-off-by: Stephan Holljes >> --- >> doc/examples/Makefile | 1 + >> doc/examples/http_multiclient.c | 101 >> >> 2

[FFmpeg-devel] [PATCH 7/9] lavf/http: increase range for listen, handle connection closing accordingly, add http_handshake and move handshake logic there

Signed-off-by: Stephan Holljes --- libavformat/http.c | 44 +++- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 3c1ec35..6338d80 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -129,

[FFmpeg-devel] [PATCH 6/9] lavf/http: add http_accept

Signed-off-by: Stephan Holljes --- libavformat/http.c | 19 +++ 1 file changed, 19 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index 676bfd5..3c1ec35 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -25,6 +25,7 @@ #include #endif /* CONFIG_ZLI

[FFmpeg-devel] [PATCH 5/9] lavf/tcp: increase range for listen and call the underlying socket operations accordingly

Signed-off-by: Stephan Holljes --- libavformat/tcp.c | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 71dff7a..9a8e46e 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -45,7 +45,7 @@ typedef struct TCPContex

[FFmpeg-devel] [PATCH 2/9] lavf/avio: add ffurl_accept and ffurl_handshake

Signed-off-by: Stephan Holljes --- libavformat/avio.c | 19 +++ libavformat/url.h | 18 ++ 2 files changed, 37 insertions(+) diff --git a/libavformat/avio.c b/libavformat/avio.c index c188adc..1182336 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -2

[FFmpeg-devel] [PATCH 3/9] lavf/avio: add avio_accept and avio_handshake

Signed-off-by: Stephan Holljes --- libavformat/avio.h| 16 libavformat/aviobuf.c | 17 + 2 files changed, 33 insertions(+) diff --git a/libavformat/avio.h b/libavformat/avio.h index d3d9bbd..b7a4fa8 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@

[FFmpeg-devel] [PATCH 4/9] lavf/tcp: add tcp_accept

Signed-off-by: Stephan Holljes --- libavformat/tcp.c | 18 ++ 1 file changed, 18 insertions(+) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index f24cad2..71dff7a 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Stre

[FFmpeg-devel] [PATCH 1/9] lavf/network: split ff_listen_bind into ff_listen and ff_accept

Signed-off-by: Stephan Holljes --- libavformat/network.c | 27 +-- libavformat/network.h | 20 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/libavformat/network.c b/libavformat/network.c index 47ade8c..7a326d2 100644 --- a/libavformat

Re: [FFmpeg-devel] [PATCH 7/9] lavf/http: increase range for listen, handle connection closing accordingly, add http_handshake and move handshake logic there

On Fri, Jul 3, 2015 at 4:18 PM, Nicolas George wrote: > Le quintidi 15 messidor, an CCXXIII, Stephan Holljes a écrit : >> Signed-off-by: Stephan Holljes >> --- >> libavformat/http.c | 45 - >> 1 file changed, 32 insertions(+), 13 deletions(-) >> >> dif

Re: [FFmpeg-devel] [PATCH 4/4] avcodec: loongson optimized h264pred with mmi

i will offer a download source of Fedora21 OS next Monday. i will run yum-builddep ffmpeg-xxx.src.rpm for preparing devel environment. what else do you need to install, because it maybe slow for downloading other packages abroad. the new FC21 build with mips64el N64 API and mips64r2(-march=loongs

[FFmpeg-devel] [PATCH] fate/api: simplify

Signed-off-by: James Almer --- tests/fate/api.mak | 19 +-- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/fate/api.mak b/tests/fate/api.mak index 4a1ee81..34c7f45 100644 --- a/tests/fate/api.mak +++ b/tests/fate/api.mak @@ -1,23 +1,14 @@ -FATE_API_LIBAVCODEC

Re: [FFmpeg-devel] [PATCH] texi2pod: fix an unescaped left brace

On 01/07/15 6:32 PM, James Almer wrote: > This silences some deprecation warnings > > Signed-off-by: James Almer > --- > doc/texi2pod.pl | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl > index e1ff6b4..9a9b34f 100644 > --- a/doc/texi2po

Re: [FFmpeg-devel] [PATCH] fate/api-tests: Tests that need samples should only run if SAMPLES is set

On Fri, Jul 03, 2015 at 12:38:26AM +0100, George Boyle wrote: > This change fixes a bug where a test that required a sample was being included > in the suite when SAMPLES was not set. It also improves the consistency of > variable names relating to the API tests. > --- > tests/fate/api.mak | 18 ++

Re: [FFmpeg-devel] [PATCH 2/2] wmalosslessdec: reset frame->nb_samples on packet loss

On Fri, Jul 03, 2015 at 12:07:10AM +0200, Andreas Cadhalpun wrote: > Otherwise a frame with non-zero nb_samples but without any data can be > returned. > > Signed-off-by: Andreas Cadhalpun > --- > libavcodec/wmalosslessdec.c | 1 + > 1 file changed, 1 insertion(+) i think this is ok, it fits wi

Re: [FFmpeg-devel] Patch for x86 YUV->BGR32 using MMX

On Fri, Jul 03, 2015 at 11:18:16AM -0700, Kevin Coyle wrote: > Attached is the updated patch to fix alpha. > > On Thu, Jul 2, 2015 at 11:02 AM, Kevin Coyle wrote: > > > Hi all, > > > > Attached is a patch to convert YUV->BGR32 using MMX. > > > > Thanks. > > > > > > > swscale_template.c | 30

Re: [FFmpeg-devel] [PATCH 2/3] swscale: ayuv16 input support

On Fri, Jul 03, 2015 at 09:59:58PM +0200, Michael Niedermayer wrote: > On Fri, Jul 03, 2015 at 04:16:32PM +, Paul B Mahol wrote: > > Signed-off-by: Paul B Mahol > > --- > > libswscale/input.c| 36 > > libswscale/swscale_internal.h | 2 ++ > >

Re: [FFmpeg-devel] [PATCH 1/3] avutil: add AYVU16LE and AYVU16BE packed pixel format

On Fri, Jul 03, 2015 at 04:16:31PM +, Paul B Mahol wrote: > Signed-off-by: Paul B Mahol > --- > libavutil/pixdesc.c | 26 ++ > libavutil/pixfmt.h | 2 ++ > libavutil/version.h | 2 +- > 3 files changed, 29 insertions(+), 1 deletion(-) LGTM thanks [...] -- Michae

Re: [FFmpeg-devel] [PATCH 3/3] swscale: ayuv16le output support

On Fri, Jul 03, 2015 at 04:16:33PM +, Paul B Mahol wrote: > Signed-off-by: Paul B Mahol > --- > libswscale/output.c | 48 > libswscale/utils.c | 2 +- > 2 files changed, 49 insertions(+), 1 deletion(-) this is missing upddates to fate [...]

Re: [FFmpeg-devel] [PATCH 2/3] swscale: ayuv16 input support

On Fri, Jul 03, 2015 at 04:16:32PM +, Paul B Mahol wrote: > Signed-off-by: Paul B Mahol > --- > libswscale/input.c| 36 > libswscale/swscale_internal.h | 2 ++ > libswscale/swscale_unscaled.c | 1 + > libswscale/utils.c| 2 +- >

Re: [FFmpeg-devel] [GSoC 2015] Segmentation fault with av_malloc()

Thanks guys, I'll try it out. -Niklesh ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [GSoC 2015] Segmentation fault with av_malloc()

Hi Niklesh, On Fri, Jul 3, 2015 at 1:47 PM, Niklesh Lalwani wrote: > Hello everyone, > > I am working with movtextdec.c to implement support for various Text > Modifier Boxes. I am getting a segmentation fault with m->style_temp = > av_malloc() and I cannot figure out why. Allocation segmentat

Re: [FFmpeg-devel] FFmpeg/MPlayer/rtmpdump possibly searching for a new server and hosting

On Fri, Jul 03, 2015 at 07:53:43PM +0200, Michael Niedermayer wrote: > Hi all > > It is POSSIBLE that we need to move to different servers/hosting. > We have been informed that the free hosting and servers we use > currently may become unavailable in the future. > > Thus if someone can provide th

Re: [FFmpeg-devel] FFmpeg/MPlayer/rtmpdump possibly searching for a new server and hosting

On Fri, 3 Jul 2015 19:53:43 +0200 Michael Niedermayer wrote: > Hi all > > It is POSSIBLE that we need to move to different servers/hosting. > We have been informed that the free hosting and servers we use > currently may become unavailable in the future. > > Thus if someone can provide the FFmp

Re: [FFmpeg-devel] [GSoC 2015] Segmentation fault with av_malloc()

On Fri, 3 Jul 2015 23:17:09 +0530 Niklesh Lalwani wrote: > Hello everyone, > > I am working with movtextdec.c to implement support for various Text > Modifier Boxes. I am getting a segmentation fault with m->style_temp = > av_malloc() and I cannot figure out why. I tried to play around with > se

Re: [FFmpeg-devel] Patch for x86 YUV->BGR32 using MMX

Attached is the updated patch to fix alpha. On Thu, Jul 2, 2015 at 11:02 AM, Kevin Coyle wrote: > Hi all, > > Attached is a patch to convert YUV->BGR32 using MMX. > > Thanks. > > > From 6eb02502ab8d16d6f9253d91b8b8cdbbc11f1a93 Mon Sep 17 00:00:00 2001 From: Kevin Coyle Date: Fri, 3 Jul 2015 11:

Re: [FFmpeg-devel] FFmpeg/MPlayer/rtmpdump possibly searching for a new server and hosting

How much equipment or server resources do you need. I should be able to host this. Kieran On 3 July 2015 at 18:53, Michael Niedermayer wrote: > Hi all > > It is POSSIBLE that we need to move to different servers/hosting. > We have been informed that the free hosting and servers we use > currentl

[FFmpeg-devel] FFmpeg/MPlayer/rtmpdump possibly searching for a new server and hosting

Hi all It is POSSIBLE that we need to move to different servers/hosting. We have been informed that the free hosting and servers we use currently may become unavailable in the future. Thus if someone can provide the FFmpeg/MPlayer/rtmpdump projects with a free server and hosting, knows of some co

[FFmpeg-devel] [GSoC 2015] Segmentation fault with av_malloc()

Hello everyone, I am working with movtextdec.c to implement support for various Text Modifier Boxes. I am getting a segmentation fault with m->style_temp = av_malloc() and I cannot figure out why. I tried to play around with several things to find out the reason, but in vain. Must be something pre

Re: [FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

On 7/3/15, Michael Niedermayer wrote: > On Fri, Jul 03, 2015 at 12:34:21PM +0200, Carl Eugen Hoyos wrote: >> Hi! >> >> Attached patch allows lossless encoding of lena.pnm >> in yuv420p, yuv422p, yuv410p and yuv411p with the >> native jpeg 2000 encoder, fixes tickets #535 and >> #4524. >> Tested on

Re: [FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

On Fri, Jul 03, 2015 at 12:34:21PM +0200, Carl Eugen Hoyos wrote: > Hi! > > Attached patch allows lossless encoding of lena.pnm > in yuv420p, yuv422p, yuv410p and yuv411p with the > native jpeg 2000 encoder, fixes tickets #535 and > #4524. > Tested only with FFmpeg, all other decoders also > f

Re: [FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

On Fri, Jul 03, 2015 at 01:15:56PM +, Carl Eugen Hoyos wrote: > Paul B Mahol gmail.com> writes: > > > ffmpeg -f lavfi -i testsrc -strict -2 -pix_fmt yuv420p /tmp/o.j2k > > Thank you! > Chroma-subsampling currently only works for 256x256 fixed, this was a decoder bug though [...] -- Michae

[FFmpeg-devel] [PATCH 2/3] swscale: ayuv16 input support

Signed-off-by: Paul B Mahol --- libswscale/input.c| 36 libswscale/swscale_internal.h | 2 ++ libswscale/swscale_unscaled.c | 1 + libswscale/utils.c| 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/libswscale/in

[FFmpeg-devel] [PATCH 1/3] avutil: add AYVU16LE and AYVU16BE packed pixel format

Signed-off-by: Paul B Mahol --- libavutil/pixdesc.c | 26 ++ libavutil/pixfmt.h | 2 ++ libavutil/version.h | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 32dc4b8..3e23af3 100644 --- a/libavutil/pix

[FFmpeg-devel] [PATCH 3/3] swscale: ayuv16le output support

Signed-off-by: Paul B Mahol --- libswscale/output.c | 48 libswscale/utils.c | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/libswscale/output.c b/libswscale/output.c index 09e3369..042b36f 100644 --- a/libswscale/output.c

Re: [FFmpeg-devel] [PATCH v2 4/8] aacenc: reset marked IS and M/S bands upon frame encoding

On Fri, Jul 03, 2015 at 12:02:18AM -0300, Claudio Freire wrote: > On Thu, Jul 2, 2015 at 3:13 PM, Rostislav Pehlivanov > wrote: > > This commit resets any bands marked as M/S or IS upon encoding a frame. > > This is needed because the arrays may contain some residual information > > upon allocat

Re: [FFmpeg-devel] [PATCH 7/9] lavf/http: increase range for listen, handle connection closing accordingly, add http_handshake and move handshake logic there

Le quintidi 15 messidor, an CCXXIII, Stephan Holljes a écrit : > Signed-off-by: Stephan Holljes > --- > libavformat/http.c | 45 - > 1 file changed, 32 insertions(+), 13 deletions(-) > > diff --git a/libavformat/http.c b/libavformat/http.c > index d9c3

Re: [FFmpeg-devel] [PATCH 6/9] lavf/http: add http_accept

Le quintidi 15 messidor, an CCXXIII, Stephan Holljes a écrit : > Signed-off-by: Stephan Holljes > --- > libavformat/http.c | 19 +++ > 1 file changed, 19 insertions(+) > > diff --git a/libavformat/http.c b/libavformat/http.c > index 676bfd5..d9c3624 100644 > --- a/libavformat/htt

Re: [FFmpeg-devel] [PATCH 4/9] lavf/tcp: add tcp_accept

Le quintidi 15 messidor, an CCXXIII, Stephan Holljes a écrit : > Signed-off-by: Stephan Holljes > --- > libavformat/tcp.c | 19 +++ > 1 file changed, 19 insertions(+) > > diff --git a/libavformat/tcp.c b/libavformat/tcp.c > index f24cad2..875da50 100644 > --- a/libavformat/tcp.c

Re: [FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

Paul B Mahol gmail.com> writes: > ffmpeg -f lavfi -i testsrc -strict -2 -pix_fmt yuv420p /tmp/o.j2k Thank you! Chroma-subsampling currently only works for 256x256 Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mail

Re: [FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

On 7/3/15, Carl Eugen Hoyos wrote: > Paul B Mahol gmail.com> writes: > >> > Attached patch allows lossless encoding of lena.pnm >> > in yuv420p, yuv422p, yuv410p and yuv411p with the >> > native jpeg 2000 encoder, fixes tickets #535 and >> > #4524. > >> Isn't lossy one broken with those pixel for

Re: [FFmpeg-devel] [PATCHv3] avcodec: Add support for Closed Caption export in h264

On Thu, Jul 02, 2015 at 08:18:13PM +0100, Kieran Kunhya wrote: > --- > libavcodec/h264.c | 11 +++ > libavcodec/h264.h | 2 ++ > libavcodec/h264_sei.c | 35 ++- > 3 files changed, 47 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/h264.c b

Re: [FFmpeg-devel] [PATCH v2 5/8] aacenc: use the new function for setting special band scalefactor indices

On Thu, Jul 2, 2015 at 3:13 PM, Rostislav Pehlivanov wrote: > This commit enables the function added with commit 7c10b87 and uses that new > function for setting any special scalefactor indices. This commit does not > change the behaviour of the encoder since no bands are being marked as either

Re: [FFmpeg-devel] [PATCH v2 2/8] aaccoder: remove previous PNS implementation from twoloop

On Thu, Jul 2, 2015 at 3:13 PM, Rostislav Pehlivanov wrote: > This commit undoes commit c5d4f87e8427c0952278ec247fa8ab1e6e52 and > removes PNS band marking from the twoloop coder, which has been reimplemented > in a better way in this series of patches. LGTM as long as the rest of the patc

Re: [FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

Paul B Mahol gmail.com> writes: > > Attached patch allows lossless encoding of lena.pnm > > in yuv420p, yuv422p, yuv410p and yuv411p with the > > native jpeg 2000 encoder, fixes tickets #535 and > > #4524. > Isn't lossy one broken with those pixel formats? It works fine here, how can I reproduc

Re: [FFmpeg-devel] [PATCH v2 3/8] aaccoder: fix M/S coding

On Fri, Jul 03, 2015 at 12:01:44AM -0300, Claudio Freire wrote: > On Thu, Jul 2, 2015 at 3:13 PM, Rostislav Pehlivanov > wrote: > > There were some mistakes in the code for M/S stereo, this commit fixes > > them. The start variable was not being reset for every window and every > > access to the

Re: [FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

On 7/3/15, Carl Eugen Hoyos wrote: > Hi! > > Attached patch allows lossless encoding of lena.pnm > in yuv420p, yuv422p, yuv410p and yuv411p with the > native jpeg 2000 encoder, fixes tickets #535 and > #4524. > Tested only with FFmpeg, all other decoders also > fail for file3.jp2, the relevant sam

Re: [FFmpeg-devel] [PATCH v2 1/8] aacpsy: use a different metric for the spread of a band

On Thu, Jul 02, 2015 at 11:56:15PM -0300, Claudio Freire wrote: > On Thu, Jul 2, 2015 at 3:13 PM, Rostislav Pehlivanov > wrote: > > This commit modifies 02dbed6 to use band->active_lines to better gauge how > > much information is contained within a single band and thus allow the > > perceptual

[FFmpeg-devel] [PATCH]Allow native jpeg 2000 encoding yuv42x and yuv41x

Hi! Attached patch allows lossless encoding of lena.pnm in yuv420p, yuv422p, yuv410p and yuv411p with the native jpeg 2000 encoder, fixes tickets #535 and #4524. Tested only with FFmpeg, all other decoders also fail for file3.jp2, the relevant sample from the reference file suite. Please com

Re: [FFmpeg-devel] [PATCH 9/9] Add http multi-client example code

Le quintidi 15 messidor, an CCXXIII, Stephan Holljes a écrit : > Signed-off-by: Stephan Holljes > --- > doc/examples/Makefile | 1 + > doc/examples/http_multiclient.c | 101 > > 2 files changed, 102 insertions(+) > create mode 100644 doc/exam

Re: [FFmpeg-devel] GSoC update

Le quintidi 15 messidor, an CCXXIII, Stephan Holljes a écrit : > >> +if ((ret = ffurl_alloc(c, s->filename, AVIO_FLAG_READ_WRITE, > >> &sl->interrupt_callback)) < 0) > > AVIO_FLAG_READ_WRITE seems wrong. > Changed to AVIO_FLAG_WRITE, but don't we read the request data from > the client? Why do

[FFmpeg-devel] [PATCH 4/4] avcodec: loongson optimized h264pred with mmi

>From dc50d05ba8a4d40e17f15a52237f33cff0205fea Mon Sep 17 00:00:00 2001 From: ZhouXiaoyong Date: Fri, 3 Jul 2015 16:56:01 +0800 Subject: [PATCH 4/4] avcodec: loongson optimized h264pred with mmi Signed-off-by: ZhouXiaoyong --- libavcodec/mips/Makefile | 1 + libavcodec/mips/h264p

[FFmpeg-devel] [PATCH 3/4] configure: add loongson2 cpu support

>From c6c4faaab7c598ce0fb6f7a4afab825f7a86 Mon Sep 17 00:00:00 2001 From: ZhouXiaoyong Date: Fri, 3 Jul 2015 16:44:12 +0800 Subject: [PATCH 3/4] configure: add loongson2 cpu support Signed-off-by: ZhouXiaoyong --- configure | 21 + 1 file changed, 17 insertions(+), 4 de

[FFmpeg-devel] [PATCH 2/4] use mmi instead of loongson3 as simd-optimization flag

>From 0b953ff84cce87c2b988852aa59c899e2fa23309 Mon Sep 17 00:00:00 2001 From: ZhouXiaoyong Date: Fri, 3 Jul 2015 16:27:48 +0800 Subject: [PATCH 2/4] use mmi instead of loongson3 as simd-optimization flag Signed-off-by: ZhouXiaoyong --- Makefile | 2 +- arch.mak

[FFmpeg-devel] [PATCH 1/4] avcodec: loongson remove useless macros in mipsfpu optimization

>From be9c7fd9b3ddcba9c122c933717f54437d2e1c8a Mon Sep 17 00:00:00 2001 From: ZhouXiaoyong Date: Fri, 3 Jul 2015 15:59:00 +0800 Subject: [PATCH 1/4] avcodec: loongson remove useless macros in mipsfpu optimization Loongson has disabled all mipsfpu optimization as fate-test faild. Signed-off-by

Re: [FFmpeg-devel] [PATCH] avfilter/vf_lut: 10bit planar yuv support

On 7/1/15, Paul B Mahol wrote: > Signed-off-by: Paul B Mahol > --- > > The fate test should be redone. > > --- > libavfilter/vf_lut.c | 57 > --- > tests/ref/fate/filter-pixfmts-lut | 4 +++ > 2 files changed, 51 insertions(+), 10 deletions(-) >