Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Reimar Döffinger
On Mon, Dec 15, 2014 at 10:24:55AM +, Carl Eugen Hoyos wrote: > Thomas Volkert gmx.net> writes: > > > +#include > > This will hopefully be unneeded. > > > codec->sample_rate = avio_rl32(pb); > > codec->bit_rate= avio_rl32(pb) * 8; > > codec->block_align = avio_rl16(pb

Re: [FFmpeg-devel] mjpeg2jpeg_filter

2014-12-15 Thread Reimar Döffinger
On Sun, Dec 14, 2014 at 08:10:31AM -0500, Don Moir wrote: > I needed to convert AVI1 to normal jpeg. This happens a lot with camera > streams and the code in mjpeg2jpeg_filter works fine. > > I was looking at the code in mjpeg2jpeg_filter in file mjpeg2jpeg_bsf.c and > noticing that just creates

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread arwa arif
On Tue, Dec 16, 2014 at 6:06 AM, Michael Niedermayer wrote: > > On Mon, Dec 15, 2014 at 10:55:26PM +0530, arwa arif wrote: > > This patch seems to be working. Sorry for the previous one. > > > doc/filters.texi | 24 > > libavfilter/Makefile |1 > > libavfilter/

Re: [FFmpeg-devel] [PATCH 1/2] Move AVPicture definition from lavc to lavu

2014-12-15 Thread Michael Niedermayer
On Sun, Dec 14, 2014 at 04:47:43PM +0100, Clément Bœsch wrote: > This is necessary before moving AVSubtitle* structures. > --- > doc/APIchanges | 4 > libavcodec/avcodec.h | 25 ++--- > libavcodec/version.h | 2 +- > libavutil/Makefile | 1 + > libavutil/picture

Re: [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: fix hls_write_trailer() on hls_start() failure

2014-12-15 Thread Michael Niedermayer
On Mon, Dec 15, 2014 at 06:10:46PM -0600, Christian Suloway wrote: > Close segment I/O context and append segment in hls_write_trailer() only > when segment I/O context is allocated. > > Signed-off-by: Christian Suloway > --- > libavformat/hlsenc.c | 10 ++ > 1 file changed, 6 insertions

Re: [FFmpeg-devel] [PATCH] snow_dwt: Don't try and free members of non-existent arrays

2014-12-15 Thread Michael Niedermayer
On Mon, Dec 15, 2014 at 10:57:28PM +, Derek Buitenhuis wrote: > If allocation fails earlier on, and thd next frame is processed, > the slice buffer could be left in a state where line and data_stack > have already been freed, or are otherwise null pointers. > > Signed-off-by: Derek Buitenhuis

Re: [FFmpeg-devel] How to make the link.exe as MSVC's link

2014-12-15 Thread Jesse Jiang
I know, but I want make it more easly. It will confusuon the beginer. Sent from Surface From: Derek Buitenhuis Sent: ‎Tuesday‎, ‎December‎ ‎16‎, ‎2014 ‎12‎:‎06‎ ‎PM To: FFmpeg development discussions and patches On 12/16/2014 12:39 AM, Jesse Jiang wrote: > Hi All, > > > I want to

Re: [FFmpeg-devel] How to make the link.exe as MSVC's link

2014-12-15 Thread Derek Buitenhuis
On 12/16/2014 12:39 AM, Jesse Jiang wrote: > Hi All, > > > I want to make MSVC build ffmpeg more easily. There is a problem, if we > launch msys.bat which in mingw enviroment, the link.exe in msys will conflict > with link.exe in MSVC. This is covered in the documentation: http://ffmpeg.org/p

[FFmpeg-devel] How to make the link.exe as MSVC's link

2014-12-15 Thread Jesse Jiang
Hi All, I want to make MSVC build ffmpeg more easily. There is a problem, if we launch msys.bat which in mingw enviroment, the link.exe in msys will conflict with link.exe in MSVC. So I try to change the configure like this msvc) # Check whether the current MSVC version needs th

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread Michael Niedermayer
On Mon, Dec 15, 2014 at 10:55:26PM +0530, arwa arif wrote: > This patch seems to be working. Sorry for the previous one. > doc/filters.texi | 24 > libavfilter/Makefile |1 > libavfilter/allfilters.c |1 > libavfilter/libmpcodecs/vf_fspp.c |

[FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: fix hls_write_trailer() on hls_start() failure

2014-12-15 Thread Christian Suloway
Close segment I/O context and append segment in hls_write_trailer() only when segment I/O context is allocated. Signed-off-by: Christian Suloway --- libavformat/hlsenc.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c ind

[FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: added HLS encryption

2014-12-15 Thread Christian Suloway
Added HLS encryption with -hls_key_info_file option. The first line of key_info_file specifies the key URI for the playlist. The second line specifies the path to the file containing the encryption key. An optional third line specifies an IV to use instead of the segment number. Changes to key_inf

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: added HLS encryption

2014-12-15 Thread Christian Suloway
On 12/12/14, 9:57 PM, "Michael Niedermayer" wrote: >combining the random seed with a LFG seems a bit odd >i would out of principle use something stronger, though i dont know >what the exact scenarios are this is intended to prevent, so maybe >its fine Yes, this is a good point. I will resubmit th

[FFmpeg-devel] [PATCH] snow_dwt: Don't try and free members of non-existent arrays

2014-12-15 Thread Derek Buitenhuis
If allocation fails earlier on, and thd next frame is processed, the slice buffer could be left in a state where line and data_stack have already been freed, or are otherwise null pointers. Signed-off-by: Derek Buitenhuis --- libavcodec/snow_dwt.c | 9 +++-- 1 file changed, 7 insertions(+),

Re: [FFmpeg-devel] [PATCH] avformat/concatdec: Handle NOPTS start_time

2014-12-15 Thread Michael Niedermayer
On Mon, Dec 15, 2014 at 06:53:19PM +0100, Nicolas George wrote: > Le quintidi 25 frimaire, an CCXXIII, Michael Niedermayer a écrit : > > Lines: 36 > > > > Fixes Ticket3598 > > > > Signed-off-by: Michael Niedermayer > > --- > > libavformat/concatdec.c | 11 --- > > 1 file changed, 8 in

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread Carl Eugen Hoyos
arwa arif gmail.com> writes: > + * it under the terms of the GNU General Public License The configure part is missing that makes sure the filter is only compiled when --enable-gpl was used. > +DECLARE_ALIGNED(32, static const uint8_t, dither)[8][8] = { > +{ 0, 48, 12, 60, 3, 51, 15

Re: [FFmpeg-devel] [PATCH] avformat/concatdec: Handle NOPTS start_time

2014-12-15 Thread Nicolas George
Le quintidi 25 frimaire, an CCXXIII, Michael Niedermayer a écrit : > Lines: 36 > > Fixes Ticket3598 > > Signed-off-by: Michael Niedermayer > --- > libavformat/concatdec.c | 11 --- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/libavformat/concatdec.c b/libavforma

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread arwa arif
This patch seems to be working. Sorry for the previous one. From 97d90c5a1a8c10a1b19a5250c90d02fb74e79735 Mon Sep 17 00:00:00 2001 From: Arwa Arif Date: Sun, 14 Dec 2014 12:03:31 +0530 Subject: [PATCH] Port fspp to FFmpeg --- doc/filters.texi | 24 + libavfilter/Makefile

Re: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_spp: support 10bit per sample

2014-12-15 Thread Michael Niedermayer
On Fri, Dec 12, 2014 at 04:53:59PM +0100, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer > --- > libavfilter/vf_spp.c | 89 > -- > 1 file changed, 71 insertions(+), 18 deletions(-) applied [...] -- Michael GnuPG fingerprin

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/avdct: support >8bit per sample dcts

2014-12-15 Thread Michael Niedermayer
On Fri, Dec 12, 2014 at 04:53:58PM +0100, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer > --- > libavcodec/avdct.c |3 +++ > libavcodec/avdct.h |2 ++ > 2 files changed, 5 insertions(+) applied [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC78704

[FFmpeg-devel] [PATCH] avformat/concatdec: Handle NOPTS start_time

2014-12-15 Thread Michael Niedermayer
Fixes Ticket3598 Signed-off-by: Michael Niedermayer --- libavformat/concatdec.c | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index a2584d7..253951a 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concat

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread Michael Niedermayer
On Mon, Dec 15, 2014 at 06:20:36PM +0530, arwa arif wrote: > Updated the patch. There was a comment in the original filter that > mul_thrmat is faster in c. So, should mul_thrmat_mmx be included or not? i dont know that code, where was that comment ? you could benchamrk it though by enclosing the

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread Carl Eugen Hoyos
arwa arif gmail.com> writes: > There was a comment in the original filter that > mul_thrmat is faster in c. So, should > mul_thrmat_mmx be included or not? Ideally, you would test yourself what is faster. Carl Eugen ___ ffmpeg-devel mailing list ffm

Re: [FFmpeg-devel] [PATCH] cmdutils: dont call read_header before listing devices

2014-12-15 Thread Michael Niedermayer
On Mon, Dec 15, 2014 at 12:36:49AM +0100, Lukasz Marek wrote: > On 15.12.2014 00:33, Lukasz Marek wrote: > >List device callback must be able to return valid list without opening > >device. > >This callback should return input values for open function, not vice-versa. > >Read header funtion is ver

Re: [FFmpeg-devel] [PATCH] lavd/alsa-audio-common: dont crash while closing not opened device

2014-12-15 Thread Nicolas George
Le quintidi 25 frimaire, an CCXXIII, Lukasz Marek a écrit : > for example > ffmpeg -f alsa -i -f alsa aaa > would crash if ffmpeg tried to close alsa after open fail. It doesn't so it > doesn't occur. > > This commit also make safe to call close function twice on the same context In that ca

Re: [FFmpeg-devel] [PATCH] lavd/alsa-audio-common: dont crash while closing not opened device

2014-12-15 Thread Lukasz Marek
On 15 December 2014 at 13:05, Nicolas George wrote: > > Le quintidi 25 frimaire, an CCXXIII, Lukasz Marek a écrit : > > snd_pcm_close() doesn't handle NULL correctly. > > > > Signed-off-by: Lukasz Marek > > --- > > libavdevice/alsa-audio-common.c | 5 - > > 1 file changed, 4 insertions(+), 1

Re: [FFmpeg-devel] [PATCH] configure: create the tests directory like the doc directory

2014-12-15 Thread Michael Niedermayer
On Sun, Dec 14, 2014 at 11:34:08PM -0800, Dave Yeo wrote: > On 12/14/14 07:42 PM, Michael Niedermayer wrote: > >This fixes an issue where the tests directory is not created for out of tree > >builds before its needed > > > >Signed-off-by: Michael Niedermayer > >--- > > configure |1 + > > 1 f

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread arwa arif
Updated the patch. There was a comment in the original filter that mul_thrmat is faster in c. So, should mul_thrmat_mmx be included or not? From ad30ab016a4f2d98e9e979c1cebf3d950d10c156 Mon Sep 17 00:00:00 2001 From: Arwa Arif Date: Sun, 14 Dec 2014 12:03:31 +0530 Subject: [PATCH] Port fspp to FFm

Re: [FFmpeg-devel] [PATCH] lavd/alsa-audio-common: dont crash while closing not opened device

2014-12-15 Thread Nicolas George
Le quintidi 25 frimaire, an CCXXIII, Lukasz Marek a écrit : > snd_pcm_close() doesn't handle NULL correctly. > > Signed-off-by: Lukasz Marek > --- > libavdevice/alsa-audio-common.c | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) I think it is ok, but can you explain the code path th

Re: [FFmpeg-devel] [PATCH 2/2] Move AVSubtitle from lavc to lavu

2014-12-15 Thread wm4
On Mon, 15 Dec 2014 11:38:58 +0100 Clément Bœsch wrote: > On Mon, Dec 15, 2014 at 10:49:47AM +0100, wm4 wrote: > > On Mon, 15 Dec 2014 10:38:01 +0100 > > Clément Bœsch wrote: > > > > > On Mon, Dec 15, 2014 at 10:23:33AM +0100, wm4 wrote: > > > > On Sun, 14 Dec 2014 16:47:44 +0100 > > > > Clémen

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread compn
On Mon, 15 Dec 2014 11:10:08 +0100 Thomas Volkert wrote: > +if (big_endian) { > +id = ntohs(id); > +codec->channels= ntohs(codec->channels); > +codec->sample_rate = ntohl(codec->sample_rate); > +codec->bit_rate= ntohl(codec->bit_rate / 8

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Carl Eugen Hoyos
Thomas Volkert gmx.net> writes: > >>if (size >= 18) { /* We're obviously dealing with WAVEFORMATEX > >> +if (big_endian) > >> +avpriv_report_missing_feature(codec, > >> "WAVEFORMATEX support for RIFX files\n"); > > Is this sufficient, no further error handling needed? > > I do n

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Thomas Volkert
On 12/15/2014 11:24 AM, Carl Eugen Hoyos wrote: Thomas Volkert gmx.net> writes: +#include This will hopefully be unneeded. Okay, this will simplify the patch. if (size >= 18) { /* We're obviously dealing with WAVEFORMATEX */ +if (big_endian) +avpriv_report_mi

Re: [FFmpeg-devel] [PATCH 2/2] Move AVSubtitle from lavc to lavu

2014-12-15 Thread Clément Bœsch
On Mon, Dec 15, 2014 at 10:49:47AM +0100, wm4 wrote: > On Mon, 15 Dec 2014 10:38:01 +0100 > Clément Bœsch wrote: > > > On Mon, Dec 15, 2014 at 10:23:33AM +0100, wm4 wrote: > > > On Sun, 14 Dec 2014 16:47:44 +0100 > > > Clément Bœsch wrote: > > > > > > > --- > > > > doc/APIchanges | 5 +

Re: [FFmpeg-devel] [PATCH] lavfi: Port fspp to FFmpeg

2014-12-15 Thread Carl Eugen Hoyos
arwa arif gmail.com> writes: > > > +DECLARE_ALIGNED (8, uint64_t, ff_MM_FIX_0_541196100)= > > > FIX64(0.541196100, 14); > > > +DECLARE_ALIGNED (8, uint64_t, ff_MM_FIX_0_707106781)= > > > FIX64(0.707106781, 14); > > > > these 2 conflict with the existing fspp filter, they > > should be removed

Re: [FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Carl Eugen Hoyos
Thomas Volkert gmx.net> writes: > +#include This will hopefully be unneeded. > codec->sample_rate = avio_rl32(pb); > codec->bit_rate= avio_rl32(pb) * 8; > codec->block_align = avio_rl16(pb); > +if (big_endian) { > +id = ntohs(id); > +co

[FFmpeg-devel] [PATCH] wavdec: RIFX file format support

2014-12-15 Thread Thomas Volkert
This fixes ticket #1978. From: Thomas Volkert --- Changelog | 1 + libavformat/act.c | 2 +- libavformat/asfdec.c | 2 +- libavformat/avidec.c | 2 +- libavformat/dxa.c | 2 +- libavformat/matroskadec.c | 2 +- libavformat/mlvdec.c | 2 +-

Re: [FFmpeg-devel] [PATCH 2/2] Move AVSubtitle from lavc to lavu

2014-12-15 Thread wm4
On Mon, 15 Dec 2014 10:38:01 +0100 Clément Bœsch wrote: > On Mon, Dec 15, 2014 at 10:23:33AM +0100, wm4 wrote: > > On Sun, 14 Dec 2014 16:47:44 +0100 > > Clément Bœsch wrote: > > > > > --- > > > doc/APIchanges | 5 +++ > > > libavcodec/avcodec.h | 63 +++--- > >

Re: [FFmpeg-devel] [PATCH 2/2] Move AVSubtitle from lavc to lavu

2014-12-15 Thread Clément Bœsch
On Mon, Dec 15, 2014 at 10:23:33AM +0100, wm4 wrote: > On Sun, 14 Dec 2014 16:47:44 +0100 > Clément Bœsch wrote: > > > --- > > doc/APIchanges | 5 +++ > > libavcodec/avcodec.h | 63 +++--- > > libavcodec/utils.c | 29 +++--- > > libavcodec/version.h |

Re: [FFmpeg-devel] [PATCH 2/2] Move AVSubtitle from lavc to lavu

2014-12-15 Thread wm4
On Sun, 14 Dec 2014 16:47:44 +0100 Clément Bœsch wrote: > --- > doc/APIchanges | 5 +++ > libavcodec/avcodec.h | 63 +++--- > libavcodec/utils.c | 29 +++--- > libavcodec/version.h | 3 ++ > libavutil/Makefile | 2 + > libavutil/subtitle.c | 62