[vlc-commits] demux:mp4: make sure we don't touch spu data on non SPU tracks

Steve Lhomme git at videolan.org
Sat Jul 8 18:39:32 CEST 2017


vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Thu Jul  6 14:51:05 2017 +0200| [1b81f8c48f168cdfec1acf114ebe61b9e801e501] | committer: Jean-Baptiste Kempf

demux:mp4: make sure we don't touch spu data on non SPU tracks

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mp4/essetup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index bf3232486b..86d718e779 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -1249,6 +1249,7 @@ int SetupSpuES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
                     p_style->i_features |= (STYLE_HAS_BACKGROUND_ALPHA | STYLE_HAS_BACKGROUND_COLOR);
                 }
             }
+            assert(p_track->fmt.i_cat == SPU_ES);
             p_track->fmt.subs.p_style = p_style;
 
             /* FIXME UTF-8 doesn't work here ? */



More information about the vlc-commits mailing list