‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Thursday, 18 de April de 2019 22:07, Michael Niedermayer
<mich...@niedermayer.cc> wrote:
>
> fails to apply cleanly
>
> Applying: libavformat: fix inputs initialization in mpegts muxer with filters
> Using index info to reconstruct a base tree...
> error: patch failed: fftools/ffmpeg.c:4613
> error: fftools/ffmpeg.c: patch does not apply
> error: Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Patch failed at 0001 libavformat: fix inputs initialization in mpegts muxer
> with filters
>
Sorry Michael another time!
Here a new version from a clean copy.
Regards.
A.H.
---
From 936740731c17a9757aa093bdb35d9772df1e64a8 Mon Sep 17 00:00:00 2001
From: Andreas Hakon <andreas.ha...@protonmail.com>
Date: Fri, 19 Apr 2019 09:17:32 +0100
Subject: [PATCH] libavformat: input init mpegts with filters v2
This patch solves the initialization of the inputs when using filters
(a graph filter) with the mpegts muxer.
This bug seems to be generated by a simple forgetting to copy. The same code is
repeated two times, but only in one case the variable inputs_done is
initialized.
Testcase:
$ ffmpeg -f mpegts -i mpeg.ts \
-filter_complex "[i:100]fps=fps=25[out]" \
-map "[out]" -c:v libx264 -f mpegts out.ts
Signed-off-by: Andreas Hakon <andreas.ha...@protonmail.com>
---
fftools/ffmpeg.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 0f157d6..7399a19 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -4613,8 +4613,10 @@ static int transcode_step(void)
}
if ((ret = transcode_from_filter(ost->filter->graph, &ist)) < 0)
return ret;
- if (!ist)
+ if (!ist) {
+ ost->inputs_done = 1;
return 0;
+ }
} else if (ost->filter) {
int i;
for (i = 0; i < ost->filter->graph->nb_inputs; i++) {
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
