Re: [FFmpeg-devel] [PATCH] cmdutils: use macros for device test

2014-12-14 Thread Lukasz Marek
On 13.12.2014 20:03, Michael Niedermayer wrote: On Sat, Dec 13, 2014 at 07:54:57PM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- cmdutils.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) LGTM pushed ___ ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] lavd/alsa-audio-common: mark default device in device list

2014-12-14 Thread Lukasz Marek
On 14.12.2014 17:10, Nicolas George wrote: Le tridi 23 frimaire, an CCXXIII, Lukasz Marek a écrit : Signed-off-by: Lukasz Marek --- libavdevice/alsa-audio-common.c | 2 ++ 1 file changed, 2 insertions(+) Looks right, thanks. pushed ___ ffmpeg

Re: [FFmpeg-devel] [PATCH 1/2] lavd/avdevice: replace av_ with ff_ for caps option table

2014-12-13 Thread Lukasz Marek
On 13.12.2014 20:54, Lukasz Marek wrote: On 13.12.2014 20:48, Reimar Döffinger wrote: On 13.12.2014, at 20:42, James Almer wrote: On 13/12/14 4:27 PM, Lukasz Marek wrote: This symbol is required for query capabilities callbacks. This symbol is only required by libavdevice and should not be

Re: [FFmpeg-devel] [PATCH 1/2] lavd/avdevice: replace av_ with ff_ for caps option table

2014-12-13 Thread Lukasz Marek
On 13.12.2014 20:48, Reimar Döffinger wrote: On 13.12.2014, at 20:42, James Almer wrote: On 13/12/14 4:27 PM, Lukasz Marek wrote: This symbol is required for query capabilities callbacks. This symbol is only required by libavdevice and should not be exported. This need a deprecation and an

[FFmpeg-devel] [PATCH 2/2] lavd/avdevice: use better option types for caps options

2014-12-13 Thread Lukasz Marek
Using dedicated types allows to use format/layout names, not just raw int values. Signed-off-by: Lukasz Marek --- libavdevice/avdevice.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c index 86deb82..e5ab0b7 100644

[FFmpeg-devel] [PATCH 1/2] lavd/avdevice: replace av_ with ff_ for caps option table

2014-12-13 Thread Lukasz Marek
This symbol is required for query capabilities callbacks. This symbol is only required by libavdevice and should not be exported. Signed-off-by: Lukasz Marek --- libavdevice/avdevice.c | 2 +- libavdevice/avdevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a

[FFmpeg-devel] [PATCH] cmdutils: use macros for device test

2014-12-13 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- cmdutils.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index b68dae9..4e0a406 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1213,12 +1213,7 @@ static int is_device(const AVClass *avclass) { if (!avclass

[FFmpeg-devel] [PATCH] lavd/alsa-audio-common: mark default device in device list

2014-12-13 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavdevice/alsa-audio-common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa-audio-common.c index 749897f..b7f5313 100644 --- a/libavdevice/alsa-audio-common.c +++ b/libavdevice/alsa-audio-common.c

Re: [FFmpeg-devel] [PATCH 2/5] lavu/dict: check for malloc failures some more

2014-12-12 Thread Lukasz Marek
On 12.12.2014 18:15, wm4 wrote: This fix is rather messy because of AV_DICT_DONT_STRDUP_VAL. It's not even clear how this should be handled. Maybe freeing the user's data on failure would actually be ok. const char* arg suggests this function should not free it, but dict would free it eventual

Re: [FFmpeg-devel] [PATCH] avformat: Implement subtitle charenc guessing

2014-12-12 Thread Lukasz Marek
On 12 December 2014 at 07:05, Rodger Combs wrote: > > diff --git a/configure b/configure > index e2e3619..a5a9f9b 100755 > --- a/configure > +++ b/configure > @@ -199,6 +199,9 @@ External library support: >--enable-gnutls enable gnutls, needed for https support >

Re: [FFmpeg-devel] [PATCH] avformat: add dump_metadata_lines

2014-12-09 Thread Lukasz Marek
W dniu środa, 10 grudnia 2014 Vittorio Giovara napisał(a): > On Tue, Dec 9, 2014 at 10:17 PM, wm4 > > wrote: > > On Tue, 9 Dec 2014 14:10:22 +0100 > > Michael Niedermayer > wrote: > > > >> TODO: bump version, update APIChanges > >> > >> Signed-off-by: Michael Niedermayer > > >> --- > >> libavfo

Re: [FFmpeg-devel] [PATCH 2/2] fate: add libavcodec/options-test

2014-12-08 Thread Lukasz Marek
On 7 December 2014 at 02:19, Lukasz Marek wrote: > On 06.12.2014 19:48, Michael Niedermayer wrote: > >> On Thu, Dec 04, 2014 at 12:50:50AM +0100, Lukasz Marek wrote: >> >>> Signed-off-by: Lukasz Marek >>> --- >>> tests/fate/libavcodec.mak

Re: [FFmpeg-devel] [PATCH] avutil/opt: Fix AV_OPT_TYPE_BINARY case in av_opt_is_set_to_default()

2014-12-07 Thread Lukasz Marek
W dniu niedziela, 7 grudnia 2014 Michael Niedermayer napisał(a): > Fixes CID1257010 > > Signed-off-by: Michael Niedermayer > > --- > libavutil/opt.c |4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavutil/opt.c b/libavutil/opt.c > index 4cf2069..d03df60 100644 >

Re: [FFmpeg-devel] [PATCH 2/2] fate: add libavcodec/options-test

2014-12-06 Thread Lukasz Marek
On 06.12.2014 19:48, Michael Niedermayer wrote: On Thu, Dec 04, 2014 at 12:50:50AM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- tests/fate/libavcodec.mak | 4 + tests/ref/fate/libavcodec-options | 161 ++ 2 files changed, 165

Re: [FFmpeg-devel] [PATCH 1/2] lavc/options: add test for avcodec_copy_context

2014-12-06 Thread Lukasz Marek
On 06.12.2014 15:59, Michael Niedermayer wrote: On Fri, Dec 05, 2014 at 12:21:21AM +0100, Michael Niedermayer wrote: On Thu, Dec 04, 2014 at 12:50:49AM +0100, Lukasz Marek wrote: [...] index 49c8b40..4148752 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -303,3 +303,176

Re: [FFmpeg-devel] [PATCH 2/2] lavc/options: fix leaks in avcodec_copy_context

2014-12-05 Thread Lukasz Marek
On 04.12.2014 23:51, Michael Niedermayer wrote: On Thu, Dec 04, 2014 at 12:54:30AM +0100, Lukasz Marek wrote: On 27.11.2014 04:17, Michael Niedermayer wrote: On Thu, Nov 27, 2014 at 12:43:57AM +0100, Lukasz Marek wrote: On 24.11.2014 05:16, Lukasz Marek wrote: Signed-off-by: Lukasz Marek

Re: [FFmpeg-devel] [PATCH] lavc/options: don't copy priv context when it is not AVOption object

2014-12-05 Thread Lukasz Marek
On 05.12.2014 00:15, Michael Niedermayer wrote: On Thu, Dec 04, 2014 at 12:50:06AM +0100, Lukasz Marek wrote: Subject: [PATCH] lavc/options: don't copy priv context when it is not AVOption object This prevents potential crash when opt API is used without a class. LGTM P

Re: [FFmpeg-devel] [PATCH 3/3] lavc/libxvid: workaround for bug in libxvidcore

2014-12-04 Thread Lukasz Marek
On 04.12.2014 12:42, Clément Bœsch wrote: On Thu, Dec 04, 2014 at 12:39:29AM +0100, Lukasz Marek wrote: On 24.11.2014 01:17, Lukasz Marek wrote: libxvidcore calculate number of threads basing on video height. If height is small enough it allocates 0 bytes long memory and writes to it. Setting

Re: [FFmpeg-devel] [PATCH 2/2] fate: add libavcodec/options-test

2014-12-03 Thread Lukasz Marek
On 04.12.2014 01:01, Timothy Gu wrote: On Wed, Dec 3, 2014 at 3:50 PM, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- tests/fate/libavcodec.mak | 4 + tests/ref/fate/libavcodec-options | 161 ++ 2 files changed, 165 insertions(+) create

Re: [FFmpeg-devel] [PATCH 1/2] lavc/options: add test for avcodec_copy_context

2014-12-03 Thread Lukasz Marek
On 04.12.2014 00:50, Lukasz Marek wrote: This test doesn't cover every possible issue with this function. It covers options management only. Signed-off-by: Lukasz Marek --- libavcodec/Makefile | 2 + libavcodec/options.c | 173 +++ 2

Re: [FFmpeg-devel] [PATCH 2/2] lavc/options: fix leaks in avcodec_copy_context

2014-12-03 Thread Lukasz Marek
On 27.11.2014 04:17, Michael Niedermayer wrote: On Thu, Nov 27, 2014 at 12:43:57AM +0100, Lukasz Marek wrote: On 24.11.2014 05:16, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/options.c | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff

[FFmpeg-devel] [PATCH 1/2] lavc/options: add test for avcodec_copy_context

2014-12-03 Thread Lukasz Marek
This test doesn't cover every possible issue with this function. It covers options management only. Signed-off-by: Lukasz Marek --- libavcodec/Makefile | 2 + libavcodec/options.c | 173 +++ 2 files changed, 175 insertions(+) diff --

[FFmpeg-devel] [PATCH 2/2] fate: add libavcodec/options-test

2014-12-03 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- tests/fate/libavcodec.mak | 4 + tests/ref/fate/libavcodec-options | 161 ++ 2 files changed, 165 insertions(+) create mode 100644 tests/ref/fate/libavcodec-options diff --git a/tests/fate/libavcodec.mak b/tests/fate

Re: [FFmpeg-devel] [PATCH] lavc/options: don't copy priv context when it is not AVOption object

2014-12-03 Thread Lukasz Marek
On 03.12.2014 01:28, Michael Niedermayer wrote: On Wed, Dec 03, 2014 at 01:24:55AM +0100, Lukasz Marek wrote: On 03.12.2014 01:15, Michael Niedermayer wrote: On Wed, Dec 03, 2014 at 12:06:47AM +0100, Lukasz Marek wrote: This prevents potential crash when opt API is used without a class

Re: [FFmpeg-devel] [PATCH 3/3] lavc/libxvid: workaround for bug in libxvidcore

2014-12-03 Thread Lukasz Marek
On 24.11.2014 01:17, Lukasz Marek wrote: libxvidcore calculate number of threads basing on video height. If height is small enough it allocates 0 bytes long memory and writes to it. Setting thread_count to 0 uses 1 thread and skips bugged code. Signed-off-by: Lukasz Marek --- libavcodec

Re: [FFmpeg-devel] [PATCH] lavf/oggenc: use meaningful error codes

2014-12-03 Thread Lukasz Marek
On 03.12.2014 01:10, Michael Niedermayer wrote: On Wed, Dec 03, 2014 at 12:36:23AM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavformat/oggenc.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) LGTM pushed

Re: [FFmpeg-devel] [PATCH] lavu/opt: handle NULL during class comparsion

2014-12-03 Thread Lukasz Marek
On 3 December 2014 at 14:29, Lukasz Marek wrote: > > On 3 December 2014 at 14:10, Michael Niedermayer wrote: > >> On Wed, Dec 03, 2014 at 12:06:18AM +0100, Lukasz Marek wrote: >> > av_opt_copy compares classes to avoid copying between mismatched >> objects. >&g

Re: [FFmpeg-devel] [PATCH] lavu/opt: handle NULL during class comparsion

2014-12-03 Thread Lukasz Marek
On 3 December 2014 at 14:10, Michael Niedermayer wrote: > On Wed, Dec 03, 2014 at 12:06:18AM +0100, Lukasz Marek wrote: > > av_opt_copy compares classes to avoid copying between mismatched objects. > > This protection fails when dest class is NULL. > > does this case actual

Re: [FFmpeg-devel] [PATCH 1/2] libavcodec/options: print a warning when copying open context

2014-12-03 Thread Lukasz Marek
On 2 December 2014 at 19:27, Lukasz Marek wrote: > Context copied from open context cannot be treated as opened. > avcodec_open2 modifies context so reopening it is also questionable. > It is worth to warn when it happens. > > Signed-off-by: Lukasz Marek > --- > lib

Re: [FFmpeg-devel] [PATCH 2/2] ffmpeg: use avcodec_copy_context before avcodec_open2 and open both ctxs

2014-12-03 Thread Lukasz Marek
On 3 December 2014 at 03:15, Michael Niedermayer wrote: > On Wed, Dec 03, 2014 at 02:02:21AM +0100, Lukasz Marek wrote: > > On 03.12.2014 01:53, Michael Niedermayer wrote: > > >On Wed, Dec 03, 2014 at 01:39:12AM +0100, Lukasz Marek wrote: > > >>On 03.12.2014 00

Re: [FFmpeg-devel] [PATCH 2/2] ffmpeg: use avcodec_copy_context before avcodec_open2 and open both ctxs

2014-12-02 Thread Lukasz Marek
On 03.12.2014 01:53, Michael Niedermayer wrote: On Wed, Dec 03, 2014 at 01:39:12AM +0100, Lukasz Marek wrote: On 03.12.2014 00:35, Michael Niedermayer wrote: On Tue, Dec 02, 2014 at 07:27:33PM +0100, Lukasz Marek wrote: avcodec_copy_context make dest context unopened. ffmpeg treats it as

Re: [FFmpeg-devel] [PATCH 2/2] ffmpeg: use avcodec_copy_context before avcodec_open2 and open both ctxs

2014-12-02 Thread Lukasz Marek
On 03.12.2014 00:35, Michael Niedermayer wrote: On Tue, Dec 02, 2014 at 07:27:33PM +0100, Lukasz Marek wrote: avcodec_copy_context make dest context unopened. ffmpeg treats it as opened. Signed-off-by: Lukasz Marek --- ffmpeg.c | 29 - 1 file changed, 20

Re: [FFmpeg-devel] [PATCH] lavc/options: don't copy priv context when it is not AVOption object

2014-12-02 Thread Lukasz Marek
On 03.12.2014 01:15, Michael Niedermayer wrote: On Wed, Dec 03, 2014 at 12:06:47AM +0100, Lukasz Marek wrote: This prevents potential crash when opt API is used without a class. Signed-off-by: Lukasz Marek --- libavcodec/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[FFmpeg-devel] [PATCH] lavf/oggenc: use meaningful error codes

2014-12-02 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavformat/oggenc.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index dda229e..f3413c5 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -348,7 +348,7 @@ static int

[FFmpeg-devel] [PATCH] lavc/options: don't copy priv context when it is not AVOption object

2014-12-02 Thread Lukasz Marek
This prevents potential crash when opt API is used without a class. Signed-off-by: Lukasz Marek --- libavcodec/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 7f9fb07..42ef754 100644 --- a/libavcodec/options.c +++ b

[FFmpeg-devel] [PATCH] lavu/opt: handle NULL during class comparsion

2014-12-02 Thread Lukasz Marek
av_opt_copy compares classes to avoid copying between mismatched objects. This protection fails when dest class is NULL. Signed-off-by: Lukasz Marek --- libavutil/opt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index d873bd2

Re: [FFmpeg-devel] [PATCH 1/3] ffserver_config: remove useless defaults

2014-12-02 Thread Lukasz Marek
On 02.12.2014 16:12, Reynaldo H. Verdejo Pinochet wrote: Looks OK. Feel free to push. pushed whole patchset, thx ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 2/2] lavc/options: fix leaks in avcodec_copy_context

2014-12-02 Thread Lukasz Marek
On 27 November 2014 at 17:56, Lukasz Marek wrote: > On 27 November 2014 at 04:17, Michael Niedermayer > wrote: > >> On Thu, Nov 27, 2014 at 12:43:57AM +0100, Lukasz Marek wrote: >> > On 24.11.2014 05:16, Lukasz Marek wrote: >> > >Signed-off-by: Lukasz

[FFmpeg-devel] [PATCH 2/2] ffmpeg: use avcodec_copy_context before avcodec_open2 and open both ctxs

2014-12-02 Thread Lukasz Marek
avcodec_copy_context make dest context unopened. ffmpeg treats it as opened. Signed-off-by: Lukasz Marek --- ffmpeg.c | 29 - 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index b44401f..4fa9f1e 100644 --- a/ffmpeg.c +++ b

[FFmpeg-devel] [PATCH 1/2] libavcodec/options: print a warning when copying open context

2014-12-02 Thread Lukasz Marek
Context copied from open context cannot be treated as opened. avcodec_open2 modifies context so reopening it is also questionable. It is worth to warn when it happens. Signed-off-by: Lukasz Marek --- libavcodec/options.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec

Re: [FFmpeg-devel] [PATCH 1/3] ffserver_config: remove useless defaults

2014-12-02 Thread Lukasz Marek
On 27 November 2014 at 00:49, Lukasz Marek wrote: > Options are already set to its defaults by AVOption API. > The only difference is for qmin, new default is 2, ffserver set to 3. > It is dead code because if condition is not meet unless user set option to > 0. > Meeting condi

[FFmpeg-devel] [PATCH] lavu/log: use const objs

2014-11-30 Thread Lukasz Marek
Logging system must not change state of passed objects. Missing consts also blocks many other places where functions should have const arguments, but it would cause a warning. Signed-off-by: Lukasz Marek --- cmdutils.c| 4 ++-- cmdutils.h| 2 +- ffmpeg.c

Re: [FFmpeg-devel] lavu/opt: add escaping to av_opt_serialize

2014-11-28 Thread Lukasz Marek
On 28.11.2014 18:51, Stefano Sabatini wrote: On date Thursday 2014-11-27 19:53:12 +0100, Lukasz Marek encoded: [...] From e84ba5a67d74f58b59f5fa30bdb60df856c4c29e Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Tue, 25 Nov 2014 20:25:10 +0100 Subject: [PATCH] lavu/opt: add escaping to

Re: [FFmpeg-devel] [PATCH] lavu/opt: add const to av_opt_copy arg

2014-11-27 Thread Lukasz Marek
On 27.11.2014 04:06, Michael Niedermayer wrote: On Thu, Nov 27, 2014 at 12:37:38AM +0100, Lukasz Marek wrote: On 24.11.2014 02:06, Michael Niedermayer wrote: On Sun, Nov 23, 2014 at 10:25:39PM +0100, Lukasz Marek wrote: On 23.11.2014 02:29, Michael Niedermayer wrote: On Sun, Nov 23, 2014 at

Re: [FFmpeg-devel] [PATCH 2/3] lavf/ffmenc: store recommended encoder configuration

2014-11-27 Thread Lukasz Marek
On 27.11.2014 01:10, Michael Niedermayer wrote: On Wed, Nov 26, 2014 at 11:53:41PM +0100, Lukasz Marek wrote: ffmenc will store recommended encoder configuration if present. This will allow the user to base on local defaults and apply only explicitly set options. If recommended encoder

Re: [FFmpeg-devel] lavu/opt: add escaping to av_opt_serialize

2014-11-27 Thread Lukasz Marek
On 27 November 2014 at 15:05, Stefano Sabatini wrote: > On date Tuesday 2014-11-25 20:38:59 +0100, Lukasz Marek encoded: > > Patch attached. > > > From 2a9de161df4e1d0083264dde94ec5b8af59cec35 Mon Sep 17 00:00:00 2001 > > From: Lukasz Marek > > Date: Tue, 25 Nov 2

Re: [FFmpeg-devel] [PATCH 2/2] lavc/options: fix leaks in avcodec_copy_context

2014-11-27 Thread Lukasz Marek
On 27 November 2014 at 04:17, Michael Niedermayer wrote: > On Thu, Nov 27, 2014 at 12:43:57AM +0100, Lukasz Marek wrote: > > On 24.11.2014 05:16, Lukasz Marek wrote: > > >Signed-off-by: Lukasz Marek > > >--- > > > libavcodec/options.c | 23 +++--

[FFmpeg-devel] [PATCH 2/3] ffserver_config: set defaults basing on absence of set value

2014-11-26 Thread Lukasz Marek
This prevents the situation when user set option to 0 and ffserver threats it as not set value, so applies the default. Signed-off-by: Lukasz Marek --- ffserver_config.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ffserver_config.c b

[FFmpeg-devel] [PATCH 3/3] ffserver_config: print warning when using default value

2014-11-26 Thread Lukasz Marek
Some of the defaults may be harmful (like buffer size). It is good user is aware of that. Signed-off-by: Lukasz Marek --- ffserver_config.c | 38 +++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/ffserver_config.c b/ffserver_config.c index

[FFmpeg-devel] [PATCH 1/3] ffserver_config: remove useless defaults

2014-11-26 Thread Lukasz Marek
: Lukasz Marek --- ffserver_config.c | 45 - 1 file changed, 45 deletions(-) diff --git a/ffserver_config.c b/ffserver_config.c index 5538aa4..8283188 100644 --- a/ffserver_config.c +++ b/ffserver_config.c @@ -234,56 +234,11 @@ static void add_codec

Re: [FFmpeg-devel] [PATCH 2/2] lavc/options: fix leaks in avcodec_copy_context

2014-11-26 Thread Lukasz Marek
On 24.11.2014 05:16, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/options.c | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 7f9fb07..8ba997c 100644 --- a/libavcodec/options.c

Re: [FFmpeg-devel] [PATCH] lavu/opt: add const to av_opt_copy arg

2014-11-26 Thread Lukasz Marek
On 24.11.2014 02:06, Michael Niedermayer wrote: On Sun, Nov 23, 2014 at 10:25:39PM +0100, Lukasz Marek wrote: On 23.11.2014 02:29, Michael Niedermayer wrote: On Sun, Nov 23, 2014 at 01:01:19AM +0100, Lukasz Marek wrote: On 23.11.2014 00:58, Lukasz Marek wrote: Signed-off-by: Lukasz Marek

[FFmpeg-devel] [PATCH 3/3] ffmpeg_opt: make use of recommended encoder configuration

2014-11-26 Thread Lukasz Marek
So far ffmpeg used recommended configuration only for codec priv options. ffmpeg will use now codec defaults and then apply recommended configuration for all options. Recommended configuration possibly contains minimal set of options to filful user configuration. Signed-off-by: Lukasz Marek

[FFmpeg-devel] [PATCH 2/3] lavf/ffmenc: store recommended encoder configuration

2014-11-26 Thread Lukasz Marek
ffmenc will store recommended encoder configuration if present. This will allow the user to base on local defaults and apply only explicitly set options. If recommended encoder configuration is not present, then non-default context's options are stored. Signed-off-by: Lukasz

[FFmpeg-devel] [PATCH 1/3] lavf/ffmdec: add common options to recommended encoder configuration

2014-11-26 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavformat/ffmdec.c | 36 +++- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 7ae906b..987f419 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -24,6

Re: [FFmpeg-devel] [PATCH 03/11] ffserver_config: map ffserver options to AVOptions

2014-11-26 Thread Lukasz Marek
On 26.11.2014 23:22, Reynaldo H. Verdejo Pinochet wrote: Hi On 11/21/2014 09:16 PM, Lukasz Marek wrote: [...] @@ -497,6 +500,14 @@ static int ffserver_save_avoption(const char *opt, const char *arg, int type, FF return 0; } +static int ffserver_save_avoption_int(const char *opt

Re: [FFmpeg-devel] [PATCH 1/2] lavc/options: fix leaks in avcodec_free_context

2014-11-26 Thread Lukasz Marek
On 24.11.2014 21:40, Michael Niedermayer wrote: On Mon, Nov 24, 2014 at 05:16:49AM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/options.c | 3 +++ 1 file changed, 3 insertions(+) LGTM pushed this one ___ ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 2/2] ffserver: dont leak pb_buffer

2014-11-26 Thread Lukasz Marek
On 26.11.2014 16:18, Reynaldo H. Verdejo Pinochet wrote: Feel free to push please. Pushed both ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 08/11] ffserver: export recommented encoder configuration

2014-11-26 Thread Lukasz Marek
On 26.11.2014 16:21, Reynaldo H. Verdejo Pinochet wrote: Hi Lukasz. Sorry for the delay. Patch looks good. Feel free to push. Pushed whole patchset until this one inclusive. Skipped [PATCH 06/11] [WIP][RFC]tools: add ffserver_config_test The rest is not commented/approved. I will resend it in

Re: [FFmpeg-devel] [PATCH 06/11] [WIP][RFC]tools: add ffserver_config_test

2014-11-26 Thread Lukasz Marek
On 26.11.2014 23:27, Reynaldo H. Verdejo Pinochet wrote: Hi Lukasz. Are you sending an updated patch for this one or I missed it somehow? maybe I should avoid commenting patches in other threads, but I removed this for now. I will repost it when it is finished. I submitted it just to present t

Re: [FFmpeg-devel] [PATCH 3/3] lavc/libxvid: workaround for bug in libxvidcore

2014-11-25 Thread Lukasz Marek
On 24.11.2014 01:17, Lukasz Marek wrote: libxvidcore calculate number of threads basing on video height. If height is small enough it allocates 0 bytes long memory and writes to it. Setting thread_count to 0 uses 1 thread and skips bugged code. Signed-off-by: Lukasz Marek --- libavcodec

Re: [FFmpeg-devel] [PATCH 2/2] lavc/utils: free private options on avcodec_open2 fail

2014-11-25 Thread Lukasz Marek
On 24.11.2014 21:46, Michael Niedermayer wrote: On Sun, Nov 23, 2014 at 12:58:07AM +0100, Lukasz Marek wrote: It protects leaking string/binary/dict options from priv context. Signed-off-by: Lukasz Marek --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) LGTM pushed both

Re: [FFmpeg-devel] [PATCH 11/11] ffmpeg_opt: make use of recommended encoder configuration

2014-11-25 Thread Lukasz Marek
On 17.11.2014 15:15, Michael Niedermayer wrote: On Mon, Nov 17, 2014 at 03:04:31AM +0100, Lukasz Marek wrote: On 17.11.2014 02:46, Lukasz Marek wrote: So far ffmpeg used recommended configuration only for codec priv options. ffmpeg will use now codec defaults and then apply recommended

Re: [FFmpeg-devel] [PATCH] lavc/avuienc: fix mem leak in case of init failure

2014-11-25 Thread Lukasz Marek
On 24.11.2014 20:51, Michael Niedermayer wrote: On Mon, Nov 24, 2014 at 04:52:01AM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/avuienc.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) LGTM pushed

Re: [FFmpeg-devel] [PATCH 2/3] lavc/libxvid: return meaningful error codes

2014-11-25 Thread Lukasz Marek
On 24.11.2014 05:00, Michael Niedermayer wrote: On Mon, Nov 24, 2014 at 04:14:06AM +0100, Lukasz Marek wrote: On 24.11.2014 03:07, Michael Niedermayer wrote: On Mon, Nov 24, 2014 at 01:17:29AM +0100, Lukasz Marek wrote: strictly, this should be errno when write returns -1, also av_log() might

[FFmpeg-devel] lavu/opt: add escaping to av_opt_serialize

2014-11-25 Thread Lukasz Marek
Patch attached. From 2a9de161df4e1d0083264dde94ec5b8af59cec35 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Tue, 25 Nov 2014 20:25:10 +0100 Subject: [PATCH] lavu/opt: add escaping to av_opt_serialize Signed-off-by: Lukasz Marek --- libavutil/opt.c| 12 +++- libavutil/opt.h

Re: [FFmpeg-devel] [PATCH 2/2] lavc/options: fix leaks in avcodec_copy_context

2014-11-23 Thread Lukasz Marek
On 24-Nov-2014 5:17 am, "Lukasz Marek" wrote: > > Signed-off-by: Lukasz Marek > --- > libavcodec/options.c | 23 +++ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/libavcodec/options.c b/libavcodec/options.c > ind

[FFmpeg-devel] [PATCH 2/2] lavc/options: fix leaks in avcodec_copy_context

2014-11-23 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/options.c | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 7f9fb07..8ba997c 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -190,6 +190,11

[FFmpeg-devel] [PATCH 1/2] lavc/options: fix leaks in avcodec_free_context

2014-11-23 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/options.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/options.c b/libavcodec/options.c index 44f3e90..7f9fb07 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -170,6 +170,9 @@ void avcodec_free_context(AVCodecContext

[FFmpeg-devel] [PATCH] lavc/avuienc: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/avuienc.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c index 700b8cb..db640bb 100644 --- a/libavcodec/avuienc.c +++ b/libavcodec/avuienc.c @@ -25,16 +25,10 @@ static

Re: [FFmpeg-devel] [PATCH 1/3] lavc/libxvid: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
On 24.11.2014 03:02, Michael Niedermayer wrote: On Mon, Nov 24, 2014 at 01:17:28AM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/libxvid.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) LGTM pushed this one and huffyuvdec, smvjpegdec

Re: [FFmpeg-devel] [PATCH 2/3] lavc/libxvid: return meaningful error codes

2014-11-23 Thread Lukasz Marek
On 24.11.2014 03:07, Michael Niedermayer wrote: On Mon, Nov 24, 2014 at 01:17:29AM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/libxvid.c | 4 1 file changed, 4 insertions(+) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 020af32..70d52b9

Re: [FFmpeg-devel] [PATCH] lavc/huffyuvdec: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
On 24.11.2014 00:52, Michael Niedermayer wrote: i think calling decode_end() is better than duplicating what it does if it works I have no opinion about that, but changed. I had to move decode_end above. I could add prototype but from these 2 I prefer move it as it is not long. Perfectly de

Re: [FFmpeg-devel] [PATCH 3/3] lavc/libxvid: workaround for bug in libxvidcore

2014-11-23 Thread Lukasz Marek
On 24.11.2014 01:17, Lukasz Marek wrote: libxvidcore calculate number of threads basing on video height. If height is small enough it allocates 0 bytes long memory and writes to it. Setting thread_count to 0 uses 1 thread and skips bugged code. Signed-off-by: Lukasz Marek --- libavcodec

[FFmpeg-devel] [PATCH 3/3] lavc/libxvid: workaround for bug in libxvidcore

2014-11-23 Thread Lukasz Marek
libxvidcore calculate number of threads basing on video height. If height is small enough it allocates 0 bytes long memory and writes to it. Setting thread_count to 0 uses 1 thread and skips bugged code. Signed-off-by: Lukasz Marek --- libavcodec/libxvid.c | 11 +++ 1 file changed, 11

[FFmpeg-devel] [PATCH 2/3] lavc/libxvid: return meaningful error codes

2014-11-23 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/libxvid.c | 4 1 file changed, 4 insertions(+) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 020af32..70d52b9 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -488,6 +488,7 @@ static av_cold int xvid_encode_init

[FFmpeg-devel] [PATCH 1/3] lavc/libxvid: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/libxvid.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index aee9dac..020af32 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -359,7 +359,7 @@ static void

Re: [FFmpeg-devel] [PATCH] lavu/opt: add const to av_opt_copy arg

2014-11-23 Thread Lukasz Marek
On 23.11.2014 02:29, Michael Niedermayer wrote: On Sun, Nov 23, 2014 at 01:01:19AM +0100, Lukasz Marek wrote: On 23.11.2014 00:58, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavutil/opt.c | 2 +- libavutil/opt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff

Re: [FFmpeg-devel] [PATCH] lavc/smvjpegdec: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
On 23.11.2014 17:25, Michael Niedermayer wrote: On Sat, Nov 22, 2014 at 11:26:04PM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/smvjpegdec.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c

Re: [FFmpeg-devel] [PATCH] lavc/huffyuvdec: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
On 23.11.2014 11:42, Michael Niedermayer wrote: On Sun, Nov 23, 2014 at 12:58:30AM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/huffyuvdec.c | 24 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/libavcodec/huffyuvdec.c b

Re: [FFmpeg-devel] [PATCH] lavc/mss1: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
On 23.11.2014 00:28, Michael Niedermayer wrote: On Sat, Nov 22, 2014 at 10:57:05PM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/mss1.c | 2 ++ 1 file changed, 2 insertions(+) LGTM pushed ___ ffmpeg-devel mailing list

Re: [FFmpeg-devel] [PATCH] libavcodec/rv30: fix mem leak in case of init failure

2014-11-23 Thread Lukasz Marek
On 23.11.2014 00:52, Michael Niedermayer wrote: On Sat, Nov 22, 2014 at 11:12:53PM +0100, Lukasz Marek wrote: Also replaced return -1 with return AVERROR(EINVAL) Signed-off-by: Lukasz Marek --- libavcodec/rv30.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) LGTM pushed

Re: [FFmpeg-devel] [PATCH] lavc/smacker: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
On 22.11.2014 23:44, Michael Niedermayer wrote: On Sat, Nov 22, 2014 at 10:46:24PM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/smacker.c | 1 + 1 file changed, 1 insertion(+) LGTM pushed ___ ffmpeg-devel mailing list

Re: [FFmpeg-devel] [PATCH 2/2] lavc/libvorbisdec: use better error codes

2014-11-22 Thread Lukasz Marek
On 23.11.2014 00:02, Michael Niedermayer wrote: On Sat, Nov 22, 2014 at 10:46:41PM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/libvorbisdec.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) LGTM pushed both

Re: [FFmpeg-devel] [PATCH] lavc/anm: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
On 22.11.2014 23:38, Michael Niedermayer wrote: On Sat, Nov 22, 2014 at 10:46:02PM +0100, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavcodec/anm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) LGTM pushed ___ ffmpeg

Re: [FFmpeg-devel] [PATCH 1/2] lavu/opt: handle NULL obj in av_opt_next

2014-11-22 Thread Lukasz Marek
On 23.11.2014 00:59, Clément Bœsch wrote: On Sun, Nov 23, 2014 at 12:58:06AM +0100, Lukasz Marek wrote: It indirectly also fixes av_opt_free for NULL objs. Signed-off-by: Lukasz Marek --- libavutil/opt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/opt.c b/libavutil

Re: [FFmpeg-devel] [PATCH] lavu/opt: add const to av_opt_copy arg

2014-11-22 Thread Lukasz Marek
On 23.11.2014 00:58, Lukasz Marek wrote: Signed-off-by: Lukasz Marek --- libavutil/opt.c | 2 +- libavutil/opt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 0546a37..47b1f0c 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c

[FFmpeg-devel] [PATCH] lavc/huffyuvdec: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/huffyuvdec.c | 24 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 3b2b0f7..5535323 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c

[FFmpeg-devel] [PATCH 2/2] lavc/utils: free private options on avcodec_open2 fail

2014-11-22 Thread Lukasz Marek
It protects leaking string/binary/dict options from priv context. Signed-off-by: Lukasz Marek --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bf2a5b9..7e37b82 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c

[FFmpeg-devel] [PATCH] lavu/opt: add const to av_opt_copy arg

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavutil/opt.c | 2 +- libavutil/opt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 0546a37..47b1f0c 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1570,7 +1570,7 @@ static int opt_size

[FFmpeg-devel] [PATCH 1/2] lavu/opt: handle NULL obj in av_opt_next

2014-11-22 Thread Lukasz Marek
It indirectly also fixes av_opt_free for NULL objs. Signed-off-by: Lukasz Marek --- libavutil/opt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/opt.c b/libavutil/opt.c index 47b1f0c..85330c9 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -50,6 +50,8 @@ const AVOption

[FFmpeg-devel] [PATCH] lavc/smvjpegdec: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/smvjpegdec.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 69327cd..261a441 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -89,8 +89,10

[FFmpeg-devel] [PATCH] libavcodec/rv30: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
Also replaced return -1 with return AVERROR(EINVAL) Signed-off-by: Lukasz Marek --- libavcodec/rv30.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index fd8fd4f..1483107 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c

[FFmpeg-devel] [PATCH] lavc/mss1: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/mss1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index 6bb524b..2eb67df 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -197,6 +197,8 @@ static av_cold int mss1_decode_init(AVCodecContext

[FFmpeg-devel] [PATCH 2/2] lavc/libvorbisdec: use better error codes

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/libvorbisdec.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c index f2c5046..db00572 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec/libvorbisdec.c @@ -40,7 +40,7

[FFmpeg-devel] [PATCH] lavc/smacker: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/smacker.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 518bdad..b5538c7 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -589,6 +589,7 @@ static av_cold int decode_init

[FFmpeg-devel] [PATCH 1/2] lavc/libvorbisdec: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/libvorbisdec.c | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c index b703b65..f2c5046 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec

[FFmpeg-devel] [PATCH] lavc/anm: fix mem leak in case of init failure

2014-11-22 Thread Lukasz Marek
Signed-off-by: Lukasz Marek --- libavcodec/anm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/anm.c b/libavcodec/anm.c index 79a87dd..3727534 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -47,8 +47,10 @@ static av_cold int decode_init(AVCodecContext

[FFmpeg-devel] [PATCH] ffserver: use avcodec_copy_context to copy context

2014-11-21 Thread Lukasz Marek
Copying context using dedicated function is safer that raw memcpy which creates shallow copy. Signed-off-by: Lukasz Marek --- ffserver.c | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ffserver.c b/ffserver.c index e3e76ba..7e36ab1 100644 --- a/ffserver.c +++ b

Re: [FFmpeg-devel] [PATCH 10/11] lavf/ffmenc: store recommended encoder configuration

2014-11-21 Thread Lukasz Marek
On 17.11.2014 02:46, Lukasz Marek wrote: ffmenc will store recommended encoder configuration if present. This will allow the user to base on local defaults and apply only explicitly set options. If recommended encoder configuration is not present, then non-default context's options are s

<    1   2   3   4   >