From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Fri, 14 Jun 2019 08:27:31 +0000 (+0200)
Subject: codec: subsvtt: unbreak rendering (fix #22425)
X-Git-Tag: archive/raspbian/3.0.11.1-2+rpi1~1^2^2^2^2^2^2^2^2^2^2^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3fd42cb51becbc454d2bb23feb07bd66e61c07cb;p=vlc.git

codec: subsvtt: unbreak rendering (fix #22425)

5ef3830f385bfa6a47e9088f9a0d13062cd61c3a regression

(cherry picked from commit 749b7b3729a5892d1a07036ef0974c17ddbe9e2e)

Gbp-Pq: Name 0002-codec-subsvtt-unbreak-rendering-fix-22425.patch
---

diff --git a/modules/codec/webvtt/subsvtt.c b/modules/codec/webvtt/subsvtt.c
index 2f79fb45..29d27d8d 100644
--- a/modules/codec/webvtt/subsvtt.c
+++ b/modules/codec/webvtt/subsvtt.c
@@ -1808,11 +1808,7 @@ static void Render( decoder_t *p_dec, mtime_t i_start, mtime_t i_stop )
 
     GetTimedTags( p_sys->p_root->p_child, i_start, i_stop, &timedtags );
     if( timedtags.i_count == 0 )
-    {
-        vlc_array_clear( &timedtags );
-        return;
-    }
-    qsort( timedtags.pp_elems, timedtags.i_count, sizeof(*timedtags.pp_elems), timedtagsArrayCmp );
+        qsort( timedtags.pp_elems, timedtags.i_count, sizeof(*timedtags.pp_elems), timedtagsArrayCmp );
 
     mtime_t i_substart = i_start;
     for( size_t i=0; i<timedtags.i_count; i++ )