ff_accept can return AVERROR(ETIMEDOUT) and errno will be 0 (or
undefined), return ret instead and return ff_neterror() in
ff_poll_interrupt instead of AVERROR(errno) in case of Windows
shenanigans.
---
libavformat/network.c | 2 +-
libavformat/tcp.c | 2 +-
2 files changed, 2 insertions(+), 2
ff_accept can return AVERROR(ETIMEDOUT) and errno will be 0 (or
undefined), return ret instead and return ff_neterror() in
ff_poll_interrupt instead of AVERROR(errno) to parse WSAGetLastError on
Windows.
---
v2 rewords the commit message to better elucidate the issue.
libavformat/network.c | 2 +-
On 17-04-08 at 14:21, Simon Thelen wrote:
> ff_accept can return AVERROR(ETIMEDOUT) and errno will be 0 (or
> undefined), return ret instead and return ff_neterror() in
> ff_poll_interrupt instead of AVERROR(errno) to parse WSAGetLastError on
> Windows.
> ---
> v2 rewords the
On 17-04-20 at 05:01, Simon Thelen wrote:
> On 17-04-08 at 14:21, Simon Thelen wrote:
> > ff_accept can return AVERROR(ETIMEDOUT) and errno will be 0 (or
> > undefined), return ret instead and return ff_neterror() in
> > ff_poll_interrupt instead of AVERROR(errno) to par
Signed-off-by: Simon Thelen
---
libavformat/segment.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 82872fa..98e7bcc 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -69,8 +69,8 @@ typedef
Works in the same manner as the hls segment_delete flag.
Signed-off-by: Simon Thelen
---
doc/muxers.texi | 5 +++
libavformat/segment.c | 89 +++
2 files changed, 94 insertions(+)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index
Signed-off-by: Simon Thelen
---
doc/ffmpeg.texi | 34 ++
1 file changed, 34 insertions(+)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index fd8a0c1..4b159fd 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -357,6 +357,40 @@ To set the language of the
Signed-off-by: Simon Thelen
---
src/contact | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/contact b/src/contact
index 077f9ca..22c1e11 100644
--- a/src/contact
+++ b/src/contact
@@ -154,6 +154,6 @@
http://ffmpeg.zeranoe.com/forum/";>FFmpeg on
On 16-03-03 at 14:09, Michael Niedermayer wrote:
> On Thu, Mar 03, 2016 at 12:57:45PM +0100, Simon Thelen wrote:
> > Signed-off-by: Simon Thelen
> > ---
> > src/contact | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/src/
&c->headers, "headers", u->priv_data);
+update_options(&c->headers, "headers", u);
// get the previous http proxt & set back to null if string size is
zero
-update_options(&c->http_proxy, "http_proxy", u->priv_data);
+update_options(&c->http_proxy, "http_proxy", u);
}
--
Simon Thelen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Patchset also fixes the issues I've been experiencing.
--
Simon Thelen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
m3u8 file, it will delete the ts segment
> out range from the list file.
[..]
I'm pretty sure this is why the hls muxer has the `-hls_wrap wrap' option.
--
Simon Thelen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On 12/08/14 at 10:36, Steven Liu wrote:
> 2014-08-12 7:26 GMT+08:00 Simon Thelen :
> > On 11/08/14 at 17:39, Steven Liu wrote:
[..]
> > > The FFmpeg hls module can make m3u8 and ts, but it dosen't delete the
> > > old ts segment file.
> > > If always run
The colon after the localtime function call needs an additional layer of
escaping or else everything until the next colon is treated as a
fontfile.
Signed-off-by: Simon Thelen
---
doc/filters.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc
On 10/09/14 at 10:24, Nicolas George wrote:
> Le quartidi 24 fructidor, an CCXXII, Simon Thelen a écrit :
> > The colon after the localtime function call needs an additional layer of
> > escaping or else everything until the next colon is treated as a
> > fontfile.
>
>
On 10/09/14 at 00:01, Simon Thelen wrote:
> The colon after the localtime function call needs an additional layer of
> escaping or else everything until the next colon is treated as a
> fontfile.
>
> Signed-off-by: Simon Thelen
> ---
> doc/filters.texi | 2 +-
> 1 f
Enabling -seek_error causes ffmpeg to quit when it notices that
stop_time <= start_time.
Closes ticket #4015.
Signed-off-by: Simon Thelen
---
doc/ffmpeg.texi | 4
ffmpeg_opt.c| 7 +++
2 files changed, 11 insertions(+)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 4fc7
On 09/10/14 at 23:05, Michael Niedermayer wrote:
> On Wed, Oct 08, 2014 at 07:13:33PM +0200, Simon Thelen wrote:
> > Enabling -seek_error causes ffmpeg to quit when it notices that
> > stop_time <= start_time.
>
> is there a reason not to stop and continue ?
> iam askin
On 10/10/14 at 00:45, Michael Niedermayer wrote:
> On Thu, Oct 09, 2014 at 11:22:07PM +0200, Simon Thelen wrote:
> > On 09/10/14 at 23:05, Michael Niedermayer wrote:
> > > On Wed, Oct 08, 2014 at 07:13:33PM +0200, Simon Thelen wrote:
> > > > Enabling -seek_error
regression since 354b26a3945eadd4ed8fcd801dfefad2566241de
---
libavcodec/imgconvert.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 7b0005b308..1fd636c83d 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgcon
Using colons to separate the outdefs is deprecated. Switch to using '|'
to separate the list items.
Signed-off-by: Simon Thelen
---
doc/filters.texi | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 53f4cb
Allow printing of sdp information to a file specified by -sdp_file
This allows users to print sdp information when at least one of the
outputs isn't an rtp stream.
Signed-off-by: Simon Thelen
---
ffmpeg.c | 30 --
ffmpeg.h | 1 +
ffmpeg_opt.c
Signed-off-by: Simon Thelen
---
doc/ffmpeg.texi | 5 +
1 file changed, 5 insertions(+)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index d774aba..6de5004 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1160,6 +1160,11 @@ requested by @command{ffserver}.
The option is intended for
ated.
The first patch fixes two bugs in ff_parse_channel_layout including an
off-by-one and an issue in the parsing helper for unknown channel
layouts.
The second patch ensures that the channel layout is returned correctly
when FF_API_GET_CHANNEL_LAYOUT_COMPAT is set.
Simon Thelen (2):
libavfilter/formats: Fi
Return layout when FF_API_GET_CHANNEL_LAYOUT_COMPAT is set even if the
layout itself is not in the deprecated style.
Signed-off-by: Simon Thelen
---
libavutil/channel_layout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/channel_layout.c b/libavutil
Fix an off-by-one in checking tail for trailing characters and ensure
that the parsing helper is only called for unknown channel layouts.
Note: This removes the check ensuring that the channel layout is > 0 and
< 63.
Signed-off-by: Simon Thelen
---
If the check ensuring 0 < chlayou
On 15-06-09 at 22:50, Michael Niedermayer wrote:
> On Tue, Jun 09, 2015 at 04:55:56AM +0200, Simon Thelen wrote:
> > Fix an off-by-one in checking tail for trailing characters
>
> > and ensure
> > that the parsing helper is only called for unknown channel layouts.
>
Signed-off-by: Simon Thelen
---
libavfilter/formats.c | 14 +++---
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 4f9773b..2d3b859 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -637,20 +637,12 @@ int
On 15-06-20 at 14:31, Michael Niedermayer wrote:
> On Wed, Jun 10, 2015 at 07:55:52PM +0200, Simon Thelen wrote:
> > Signed-off-by: Simon Thelen
> > ---
> > libavfilter/formats.c | 14 +++---
> > 1 file changed, 3 insertions(+), 11 deletions(-)
> breaks fate
Signed-off-by: Simon Thelen
---
:100644 100644 2451bf7... 8758b3d... M libavfilter/formats.c
libavfilter/formats.c | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 2451bf7..8758b3d 100644
--- a/libavfilter
Signed-off-by: Simon Thelen
---
This patch assumes FF_API_GET_CHANNEL_LAYOUT_COMPAT is set,
if that defaults to unset/is removed the fate refs will need to be
updated (for all tests without the 'c' appended).
:100644 100644 0e21416... b0377e0... M tests/ref/fate/filter-formats
test
not be noticed.**
likely not be noticed.
[..]
--
Simon Thelen
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
rtp_mpegts rtp://localhost:
Simon Thelen (2):
ffmpeg: Don't try and write sdp info if none of the outputs had an rtp
format.
doc/ffmpeg: Clarify that the sdp_file option requires an rtp output.
doc/ffmpeg.texi | 4 ++--
ffmpeg.c| 4
2 files changed, 6 insertions(
Fixes a segfault when trying to write nonexistent rtp information.
Signed-off-by: Simon Thelen
---
ffmpeg.c | 4
1 file changed, 4 insertions(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index f8b071a..a6b3c1c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2447,6 +2447,9 @@ static void print_sdp(void
Signed-off-by: Simon Thelen
---
doc/ffmpeg.texi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 08b1ed2..cf74734 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1233,9 +1233,9 @@ The option is intended for cases where
Fixes a segfault when trying to write nonexistent rtp information.
Signed-off-by: Simon Thelen
---
ffmpeg.c | 4
1 file changed, 4 insertions(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index f8b071a..6b41bb3 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2447,6 +2447,9 @@ static void print_sdp(void
On 15-11-02 at 15:09, Carl Eugen Hoyos wrote:
> Simon Thelen c-14.de> writes:
>
> > + if (j == 0)
> > + goto fail;
>
> Tabs cannot be committed to our repository, please
> remove them (this has to be fixed).
> Most FFmpeg code uses "if (!j
On 15-11-02 at 15:57, Simon Thelen wrote:
> Fixes a segfault when trying to write sdp information without an rtp
> output stream, also clarifies that the sdp_file option requires an rtp
> output format.
>
> Example of segfaulting command:
> ffmpeg -re -f lavfi -i testsrc -re -f
Using -ss as an input option shifts timestamps down by the seek, so it
doesn't have to be added to the recording time when checking whether to
stop.
Fixes #977
Signed-off-by: Simon Thelen
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
On 15-11-22 at 15:03, Simon Thelen wrote:
> Using -ss as an input option shifts timestamps down by the seek, so it
> doesn't have to be added to the recording time when checking whether to
> stop.
>
> Fixes #977
>
> Signed-off-by: Simon Thelen
> ---
> ffmp
Signed-off-by: Simon Thelen
---
tests/fate/ffmpeg.mak| 6 ++
tests/ref/fate/limited_input_seek| 1 +
tests/ref/fate/limited_input_seek-copyts | 1 +
3 files changed, 8 insertions(+)
create mode 100644 tests/ref/fate/limited_input_seek
create mode 100644 tests
Not requiring this can end up producing hilariously broken files
together with -c:s copy (e.g. a webvtt file containing binary subtitle data).
Signed-off-by: Simon Thelen
---
libavformat/webvttenc.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/libavformat/webvttenc.c b/libavformat
Signed-off-by: Simon Thelen
---
Implemented like the check for libx264 without the warn on fallback. Tested on
my system with pkg-config.
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 389de92..1d98828 100755
--- a/configure
+++ b
On 15-04-15 at 14:03, James Almer wrote:
> On 15/04/15 2:00 PM, wm4 wrote:
> > On Wed, 15 Apr 2015 17:18:58 +0200
> > Simon Thelen wrote:
> >> Signed-off-by: Simon Thelen
[..]
> > Isn't the fallback not needed anymore?
> Yeah, the pkg-config check alone is
Signed-off-by: Simon Thelen
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 389de92..93aebcb 100755
--- a/configure
+++ b/configure
@@ -5012,7 +5012,7 @@ enabled libcelt && require libcelt celt/celt.h
celt_decode
Make the segment muxer keep segment_list_size segments instead of
segment_list_size + 1 segments. This patch also changes the
documentation for segment_list_size to reduce possible confusion over
how many segments are kept.
Signed-off-by: Simon Thelen
---
doc/muxers.texi | 2
On 09/07/14 at 21:40, Simon Thelen wrote:
> Make the segment muxer keep segment_list_size segments instead of
> segment_list_size + 1 segments. This patch also changes the
> documentation for segment_list_size to reduce possible confusion over
> how many segments are kept.
What I forgo
47 matches
Mail list logo
