[vlc-commits] video_output: use the intermediate output video context to init the next chain

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Nov 13 09:47:16 2019 +0100| [38f2c0ba7a155d63835b287c8f3bccb1f0d56003] | committer: Steve Lhomme

video_output: use the intermediate output video context to init the next chain

Just like with the intermediat video format.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=38f2c0ba7a155d63835b287c8f3bccb1f0d56003
---

 src/video_output/video_output.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 8e3bd6454a..ee7e54072a 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -817,6 +817,7 @@ static void ThreadChangeFilters(vout_thread_t *vout,
     vlc_video_context *vctx_target   = source ? src_vctx : vout->p->filter.src_vctx;
 
     const es_format_t *p_fmt_current = &fmt_target;
+    vlc_video_context *vctx_current = vctx_target;
 
     for (int a = 0; a < 2; a++) {
         vlc_array_t    *array = a == 0 ? &array_static :
@@ -824,7 +825,7 @@ static void ThreadChangeFilters(vout_thread_t *vout,
         filter_chain_t *chain = a == 0 ? vout->p->filter.chain_static :
                                          vout->p->filter.chain_interactive;
 
-        filter_chain_Reset(chain, p_fmt_current, vctx_target, p_fmt_current);
+        filter_chain_Reset(chain, p_fmt_current, vctx_current, p_fmt_current);
         for (size_t i = 0; i < vlc_array_count(array); i++) {
             vout_filter_t *e = vlc_array_item_at_index(array, i);
             msg_Dbg(vout, "Adding '%s' as %s", e->name, a == 0 ? "static" : "interactive");
@@ -844,6 +845,7 @@ static void ThreadChangeFilters(vout_thread_t *vout,
         if (!filter_chain_IsEmpty(chain))
         {
             p_fmt_current = filter_chain_GetFmtOut(chain);
+            vctx_current = filter_chain_GetVideoCtxOut(chain);
         }
         vlc_array_clear(array);
     }