Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: add option to hide vsync warnings

2018-06-27 Thread Gyan Doshi
On 27-06-2018 11:30 PM, Marton Balint wrote: If we don't know why it spams the console or nobody is willing to fix it, then decrease loglevel to verbose. Will do this instead. Thanks, Gyan ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org htt

Re: [FFmpeg-devel] [PATCH 2/2] ffmpeg: fix -stream_loop with multiple inputs

2018-06-27 Thread Gyan Doshi
On 28-06-2018 02:35 AM, Marton Balint wrote: The input thread need to be properly cleaned up and re-initalized before we can start reading again in threaded mode. (threaded input reading is used when there are mode than one input file). Commit message should reference tickets 6121 and 7043.

Re: [FFmpeg-devel] Fw: [PATCH] Refactor two near-identical clauses.

2018-06-27 Thread Michael Niedermayer
On Sun, Jun 17, 2018 at 03:40:19PM +0300, Shlomi Fish wrote: > On Sun, 17 Jun 2018 03:05:27 +0200 > Michael Niedermayer wrote: > > > On Tue, Jun 12, 2018 at 12:53:20PM +0300, Shlomi Fish wrote: > > > This message did not arrive to the list after three submissions. > > > > > > Begin forwarded mes

[FFmpeg-devel] [PATCH 14/17] Add fileserver and add it to Makefile

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- Makefile | 7 ++- ffserver.c | 150 +++ fileserver.c | 97 + fileserver.h | 63 ++ 4 files changed, 282 insertions(+), 35 deletions(-) create mode 1006

[FFmpeg-devel] [PATCH 17/17] Update Documentation.txt

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- Documentation.txt | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Documentation.txt b/Documentation.txt index c8fef11..3eb52b8 100644 --- a/Documentation.txt +++ b/Documentation.txt @@ -12,13 +12,18 @@ the server is curren

[FFmpeg-devel] [PATCH 16/17] ffserver.c: Make fileserving independent of publisher to support streams that don't have mkv

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- ffserver.c | 70 +++--- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/ffserver.c b/ffserver.c index 38f10b7..3b3451e 100644 --- a/ffserver.c +++ b/ffserver.c @@ -51,7 +51,9 @@ struct ReadInfo {

[FFmpeg-devel] [PATCH 01/17] publisher.c: Redruce threads to 1 for now to avoid race conditions

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- publisher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publisher.c b/publisher.c index 56d1e24..fc3d804 100644 --- a/publisher.c +++ b/publisher.c @@ -101,7 +101,7 @@ void publisher_init(struct PublisherContext **pub, char *stream_name)

[FFmpeg-devel] [PATCH 10/17] configreader.c/.h/httpd.h: Add hls and dash, slightly change httpd interface, remove publisher.h include

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- configreader.c | 8 ++-- configreader.h | 1 + httpd.h| 9 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configreader.c b/configreader.c index 3f5b896..966dc84 100644 --- a/configreader.c +++ b/configreader.c @@ -27,7 +27,

[FFmpeg-devel] [PATCH 07/17] segment.c: Don't cast return value of av_malloc()

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/segment.c b/segment.c index 2dba287..8b76510 100644 --- a/segment.c +++ b/segment.c @@ -113,7 +113,7 @@ void segment_init(struct Segment **seg_p, AVFormatContext *fmt) int ret;

[FFmpeg-devel] [PATCH 06/17] publisher.h: Remove trailing whitespace

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- publisher.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publisher.h b/publisher.h index e25c33d..e07cb10 100644 --- a/publisher.h +++ b/publisher.h @@ -115,7 +115,7 @@ void publisher_init(struct PublisherContext **pub, char *stream_name)

[FFmpeg-devel] [PATCH 13/17] move FFServerInfo from publisher.h to httpd.h

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- httpd.h | 9 + publisher.h | 9 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/httpd.h b/httpd.h index a988916..1b2566e 100644 --- a/httpd.h +++ b/httpd.h @@ -72,6 +72,15 @@ struct HTTPDInterface { void (*shutdown)(void

[FFmpeg-devel] [PATCH 12/17] ffserver.c: Add hls and dash and adapt to new httpd interface (stub)

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- ffserver.c | 248 + 1 file changed, 210 insertions(+), 38 deletions(-) diff --git a/ffserver.c b/ffserver.c index f128b55..4f42f74 100644 --- a/ffserver.c +++ b/ffserver.c @@ -27,6 +27,9 @@ #include #includ

[FFmpeg-devel] [PATCH 15/17] ffserver.c: Improved timestamp handling.

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- ffserver.c | 37 + 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/ffserver.c b/ffserver.c index 91ad29a..38f10b7 100644 --- a/ffserver.c +++ b/ffserver.c @@ -86,7 +86,7 @@ void *read_thread(void *arg) int

[FFmpeg-devel] [PATCH 11/17] lavfhttpd.c: Adapt to new interface (stub), fix includes

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- lavfhttpd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lavfhttpd.c b/lavfhttpd.c index 3f29ec4..7c95001 100644 --- a/lavfhttpd.c +++ b/lavfhttpd.c @@ -21,6 +21,7 @@ #include "httpd.h" #include +#include int lavfhttpd_init

[FFmpeg-devel] [PATCH 08/17] segment.c: set *seg_p to NULL earlier so it is NULL for every error condition.

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/segment.c b/segment.c index 8b76510..9ec144f 100644 --- a/segment.c +++ b/segment.c @@ -114,9 +114,9 @@ void segment_init(struct Segment **seg_p, AVFormatContext *fmt) int i;

[FFmpeg-devel] [PATCH 04/17] configreader.c: Remove trailing whitespace

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- configreader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configreader.c b/configreader.c index 88bba26..3f5b896 100644 --- a/configreader.c +++ b/configreader.c @@ -76,7 +76,7 @@ int configs_parse(lua_State *L) luaL_checktype

[FFmpeg-devel] [PATCH 03/17] lavfhttpd.c: Remove trailing whitespaces

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- lavfhttpd.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lavfhttpd.c b/lavfhttpd.c index bc856af..3f29ec4 100644 --- a/lavfhttpd.c +++ b/lavfhttpd.c @@ -15,7 +15,7 @@ * License along with FFmpeg; if not, write to the F

[FFmpeg-devel] [PATCH 09/17] ffserver.c: simplify cleanup in run_server()

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- ffserver.c | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ffserver.c b/ffserver.c index cc7dc6c..f128b55 100644 --- a/ffserver.c +++ b/ffserver.c @@ -646,18 +646,10 @@ end: } av_free(winfos_p[stream_index]);

[FFmpeg-devel] [PATCH 02/17] ffserver.c: Remove trailing whitespace

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- ffserver.c | 64 +++--- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ffserver.c b/ffserver.c index 0278bc8..cc7dc6c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -86,12 +86,12 @@ void *read_thread(

[FFmpeg-devel] [PATCH 05/17] segment.c: Remove trailing whitespace

2018-06-27 Thread Stephan Holljes
Signed-off-by: Stephan Holljes --- segment.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/segment.c b/segment.c index 6c74b72..2dba287 100644 --- a/segment.c +++ b/segment.c @@ -28,7 +28,7 @@ void segment_save(struct Segment *seg, const char *filename) { AVFormatC

[FFmpeg-devel] [GSoC] FFserver: Add HLS and DASH

2018-06-27 Thread Stephan Holljes
This patchset took embarrassingly long to produce. I first took a few wrong turns, but I think I'm now at a point where I reached the limits of the public server API in libavformat. The main problem is that I cannot set options on clients that are accepted through http_accept(), for example a timeo

Re: [FFmpeg-devel] [PATCH 3/8] avcodec/dpx: Check elements in 12bps planar path

2018-06-27 Thread Carl Eugen Hoyos
2018-06-27 20:11 GMT+02:00, Michael Niedermayer : > Fixes: null pointer dereference > Fixes: > 8946/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DPX_fuzzer-5078915222601728 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by

[FFmpeg-devel] [PATCH] h264_slice: Fix return of incomplete frames from decoder

2018-06-27 Thread John Stebbins
When not using libavformat for demuxing, AVCodecContext.has_b_frames gets set too late causing the recovery frame heuristic in h264_refs to incorrectly flag an early frame as recovered. This patch sets has_b_frames earlier to prevent improperly flagging the frame as recovered. --- libavcodec/h264

Re: [FFmpeg-devel] [PATCH 6/8] avformat/movenc: Do not pass AVCodecParameters in avpriv_request_sample

2018-06-27 Thread Michael Niedermayer
On Wed, Jun 27, 2018 at 03:54:06PM -0300, James Almer wrote: > On 6/27/2018 3:11 PM, Michael Niedermayer wrote: > > Fixes: out of array read > > Fixes: ffmpeg_crash_8.avi > > > > Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan > > Caciulescu with AFLSmart > > Signed-off-by

[FFmpeg-devel] [PATCH 2/2] ffmpeg: fix -stream_loop with multiple inputs

2018-06-27 Thread Marton Balint
The input thread need to be properly cleaned up and re-initalized before we can start reading again in threaded mode. (threaded input reading is used when there are mode than one input file). Signed-off-by: Marton Balint --- fftools/ffmpeg.c | 10 +- 1 file changed, 9 insertions(+), 1 de

[FFmpeg-devel] [PATCH 1/2] ffmpeg: factorize input thread creation and destruction

2018-06-27 Thread Marton Balint
Signed-off-by: Marton Balint --- fftools/ffmpeg.c | 66 ++-- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 8d311a9ac8..8f94c5fff2 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@

Re: [FFmpeg-devel] [PATCH 6/8] avformat/movenc: Do not pass AVCodecParameters in avpriv_request_sample

2018-06-27 Thread James Almer
On 6/27/2018 3:11 PM, Michael Niedermayer wrote: > Fixes: out of array read > Fixes: ffmpeg_crash_8.avi > > Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan > Caciulescu with AFLSmart > Signed-off-by: Michael Niedermayer > --- > libavformat/movenc.c | 4 ++-- > 1 file cha

Re: [FFmpeg-devel] [PATCH 5/8] avcodec/ac3_parser: Check init_get_bits8() for failure

2018-06-27 Thread Paul B Mahol
On 6/27/18, Michael Niedermayer wrote: > Fixes: null pointer dereference > Fixes: ffmpeg_crash_6.avi > > Found-by: Thuan Pham, Marcel Boehme, Andrew Santosa and Alexandru Razvan > Caciulescu with AFLSmart > Signed-off-by: Michael Niedermayer > --- > libavcodec/ac3_parser.c | 4 +++- > 1 file cha

[FFmpeg-devel] [PATCH 8/8] tools/target_dec_fuzzer: Also optionally fuzz with a parser

2018-06-27 Thread Michael Niedermayer
Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 42 ++- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index a0e8943c82..ed9cbeaec8 100644 --- a/tools/target_dec_fuzzer.c +

[FFmpeg-devel] [PATCH 7/8] avcodec/mpeg4videodec: Check read profile before setting it

2018-06-27 Thread Michael Niedermayer
Fixes: null pointer dereference Fixes: ffmpeg_crash_7.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 23 +++ 1 file changed, 15 insertions(+), 8 deletion

[FFmpeg-devel] [PATCH 5/8] avcodec/ac3_parser: Check init_get_bits8() for failure

2018-06-27 Thread Michael Niedermayer
Fixes: null pointer dereference Fixes: ffmpeg_crash_6.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer --- libavcodec/ac3_parser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavc

[FFmpeg-devel] [PATCH 4/8] avformat/movenc: Check that frame_types other than EAC3_FRAME_TYPE_INDEPENDENT have a supported substream id

2018-06-27 Thread Michael Niedermayer
Fixes: out of array access Fixes: ffmpeg_bof_1.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/libavformat/movenc.c b/libavf

[FFmpeg-devel] [PATCH 1/8] avcodec/eac3dec: Check that channel_map does not contain more than EAC3_MAX_CHANNELS

2018-06-27 Thread Michael Niedermayer
Signed-off-by: Michael Niedermayer --- libavcodec/ac3dec.c | 27 --- libavcodec/ac3tab.c | 18 ++ libavcodec/ac3tab.h | 2 ++ libavcodec/eac3dec.c | 14 -- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/libavcodec/ac3dec.c

[FFmpeg-devel] [PATCH 6/8] avformat/movenc: Do not pass AVCodecParameters in avpriv_request_sample

2018-06-27 Thread Michael Niedermayer
Fixes: out of array read Fixes: ffmpeg_crash_8.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer --- libavformat/movenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov

[FFmpeg-devel] [PATCH 2/8] avcodec/ac3dec: Check channel_map index

2018-06-27 Thread Michael Niedermayer
Fixes: out of array read Fixes: 8924/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-5851861780267008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ac3dec.c | 7 +++ 1 file

[FFmpeg-devel] [PATCH 3/8] avcodec/dpx: Check elements in 12bps planar path

2018-06-27 Thread Michael Niedermayer
Fixes: null pointer dereference Fixes: 8946/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DPX_fuzzer-5078915222601728 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dpx.c | 10 ++

Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: add option to hide vsync warnings

2018-06-27 Thread Lou Logan
On Wed, Jun 27, 2018, at 10:00 AM, Marton Balint wrote: > > If we don't know why it spams the console or nobody is willing to fix it, > then decrease loglevel to verbose. I am strongly against adding a command > line option for this. I was just about to give the same suggestion. __

Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: add option to hide vsync warnings

2018-06-27 Thread Marton Balint
On Wed, 27 Jun 2018, Gyan Doshi wrote: On 27-06-2018 05:13 PM, Michael Niedermayer wrote: It was intended IIRC to detect cases where the code misbeahves or where the input/demuxer/parser is badly broken as in: timestamps: 1 2 4 5 7 9 durations: 9 8 1 -3 7 99 Maybe the conditio

Re: [FFmpeg-devel] [PATCH] avcodec/qsvenc: fix version detection on cygwin

2018-06-27 Thread Timo Rothenpieler
applied smime.p7s Description: S/MIME Cryptographic Signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: add option to hide vsync warnings

2018-06-27 Thread Gyan Doshi
On 27-06-2018 05:13 PM, Michael Niedermayer wrote: It was intended IIRC to detect cases where the code misbeahves or where the input/demuxer/parser is badly broken as in: timestamps: 1 2 4 5 7 9 durations: 9 8 1 -3 7 99 Maybe the condition to display the warning is faulty It can

Re: [FFmpeg-devel] Fw: [PATCH] Refactor two near-identical clauses.

2018-06-27 Thread Shlomi Fish
On Sun, 17 Jun 2018 15:40:19 +0300 Shlomi Fish wrote: > On Sun, 17 Jun 2018 03:05:27 +0200 > Michael Niedermayer wrote: > > > On Tue, Jun 12, 2018 at 12:53:20PM +0300, Shlomi Fish wrote: > > > This message did not arrive to the list after three submissions. > > > > > > Begin forwarded messag

Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: add option to hide vsync warnings

2018-06-27 Thread Michael Niedermayer
On Wed, Jun 27, 2018 at 03:03:02AM +0200, Marton Balint wrote: > > > On Wed, 27 Jun 2018, Michael Niedermayer wrote: > > >On Tue, Jun 26, 2018 at 05:13:36PM +0530, Gyan Doshi wrote: > >> > >> > >>On 26-06-2018 04:29 PM, Marton Balint wrote: > >> > Many users have queried/complained about the

Re: [FFmpeg-devel] [PATCH] avcodec/lagarith: Check that the range coded data stream is consistent when the probabilities indicate no data could have been coded.

2018-06-27 Thread Michael Niedermayer
On Thu, Jun 14, 2018 at 11:12:09PM +0200, Michael Niedermayer wrote: > Fixes: Timeout > Fixes: > 8638/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LAGARITH_fuzzer-5132046098759680 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Sig

Re: [FFmpeg-devel] [PATCH 5/5] avcodec/dvbsubdec: Compute scoretab without iterating over pixels multiple times in compute_default_clut()

2018-06-27 Thread Michael Niedermayer
On Fri, Jun 22, 2018 at 12:15:17AM +0200, Michael Niedermayer wrote: > Improves speed 102->2 sec > Testcase: > 8655/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVBSUB_fuzzer-6277869285146624 > Fixes: Timeout > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree

Re: [FFmpeg-devel] [PATCH 4/5] avcodec/ra144: Fix integer overflow in ff_eval_refl()

2018-06-27 Thread Michael Niedermayer
On Fri, Jun 22, 2018 at 12:15:16AM +0200, Michael Niedermayer wrote: > Fixes: signed integer overflow: -4096 * -524288 cannot be represented in type > 'int' > Fixes: > 8650/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RA_144_fuzzer-5734816036159488 > > Found-by: continuous fuzzing process

Re: [FFmpeg-devel] [PATCH] libavutil/encryption_info: Add unit tests.

2018-06-27 Thread Michael Niedermayer
On Tue, Jun 26, 2018 at 09:28:01AM -0700, Jacob Trimble wrote: > On Mon, Jun 25, 2018 at 5:30 PM Michael Niedermayer > wrote: > > > > On Fri, Jun 01, 2018 at 12:51:48PM -0700, Jacob Trimble wrote: > > > Signed-off-by: Jacob Trimble > > > --- > > > libavutil/Makefile| 1 + > > >

Re: [FFmpeg-devel] [PATCH] avutil/gitignore: Ignore integer test binary.

2018-06-27 Thread Michael Niedermayer
On Tue, Jun 26, 2018 at 09:35:05AM -0700, Jacob Trimble wrote: > Signed-off-by: Jacob Trimble > --- > libavutil/tests/.gitignore | 1 + > 1 file changed, 1 insertion(+) will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Asymptotically faster algor

Re: [FFmpeg-devel] [PATCH] avutil/encryption_info: Fix documentation problem.

2018-06-27 Thread Michael Niedermayer
On Tue, Jun 26, 2018 at 09:32:14AM -0700, Jacob Trimble wrote: > Signed-off-by: Jacob Trimble > --- > libavutil/encryption_info.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB "Nothing t

Re: [FFmpeg-devel] [GSOC] [PATCH] ESPCN super-resolution

2018-06-27 Thread Michael Niedermayer
On Tue, Jun 26, 2018 at 06:48:47PM +0300, Sergey Lavrushkin wrote: > Hello, > > This patch adds ESPCN super-resolution model to the srcnn filter, > renamed to sr filter. Scaling is now performed inside the sr filter, > so it does not require call to scale before it. But for SRCNN model > scaling f

[FFmpeg-devel] [PATCH] lavfi/minterpolate: fix blending calc issue.

2018-06-27 Thread Jun Zhao
the right blending calc is: (alpha * Frame_2 + (MAX - alpha) * Frame_1 + 512) >> 10 Signed-off-by: Jun Zhao --- libavfilter/vf_minterpolate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index d534315..c6a5e

Re: [FFmpeg-devel] [PATCH] avdevice/xcbgrab: check return values of xcb query functions

2018-06-27 Thread Moritz Barsnick
On Wed, Jun 27, 2018 at 10:21:51 +0200, Moritz Barsnick wrote: > Subject: [FFmpeg-devel] [PATCH] avdevice/xcbgrab: check return values of xcb > query functions Sorry, I had told git send-email to use [PATCH v2]. *shrug* > +if (!p) { > +av_log(c, AV_LOG_ERROR, "Cannot get xcb

[FFmpeg-devel] [PATCH] avdevice/xcbgrab: check return values of xcb query functions

2018-06-27 Thread Moritz Barsnick
xcb_query_pointer_reply() and xcb_get_geometry_reply() can return NULL if e.g. the X server closes or the connection is lost. This needs to be checked in order to cleanly exit, because the returned pointers are dereferenced later. Signed-off-by: Moritz Barsnick --- libavdevice/xcbgrab.c | 13 +++

Re: [FFmpeg-devel] [PATCH] avdevice/xcbgrab: check return values of xcb query functions

2018-06-27 Thread Moritz Barsnick
On Tue, Jun 26, 2018 at 23:01:16 +0200, Carl Eugen Hoyos wrote: > 2018-06-26 17:42 GMT+02:00, Moritz Barsnick : > > +fail: > > +av_free(p); > > +av_free(geo); > > I suspect this is incorrect, if it is correct, it should be a separate patch. I agree. There were two misconceptions of mine i