[FFmpeg-devel] libavformat: fix inputs initialization in mpegts muxer with filters

Submitted by Oliver Collyer via ffmpeg-devel on April 18, 2019, 7:41 a.m.

Details

Message ID ufv8RtyAZU_Im8-yLobeQXSntJsVEhvgKvZkyG5J3zHBue6gv2ogPM8feilRvHwN-_2Fk9ZfrtfhIRpSqitEqQCId_QUvbgcr2RtK3hWqcc=@protonmail.com
State New
Headers show

Commit Message

Oliver Collyer via ffmpeg-devel April 18, 2019, 7:41 a.m.
Hi Carl,

>
> Please split the patch.
>
> Carl Eugen
>

OK. Here the relevant part regargind the bug fix.
I'll send another new with the log enhancement.

Regards.
A.H.
From af81338c21c67c0ef2c30ab2009c7094b32327f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20H=C3=A5kon?= <andreas.hakon@protonmail.com>
Date: Wed, 17 Apr 2019 21:22:43 +0100
Subject: [PATCH] libavformat: input init fix mpegts filters

---
 fftools/ffmpeg.c    |    8 ++++++--
 libavformat/utils.c |    4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

1.7.10.4

Comments

Oliver Collyer via ffmpeg-devel April 18, 2019, 7:54 a.m.
> Hi Carl,
>
> > Please split the patch.
> > Carl Eugen
>
> OK. Here the relevant part regargind the bug fix.
> I'll send another new with the log enhancement.
>
> Regards.
> A.H.
>

This supersedes my previous PATCH:
https://patchwork.ffmpeg.org/patch/12783/

So, please, mark it as superseded.


Regards.
A.H.


Note: The second part is that:
https://patchwork.ffmpeg.org/patch/12791/
Only as reference.


.

Patch hide | download patch | download mbox

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 0f157d6..b74a209 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -4613,9 +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++) {
--