[vlc-commits] zvbi: Don't write in es_format_t::video_format_t when i_cat is SPU

Hugo Beauzée-Luyssen git at videolan.org
Fri Jun 16 15:22:45 CEST 2017


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jun 16 15:20:14 2017 +0200| [760f4681627234a7960544ce175c8e06c3c789c5] | committer: Hugo Beauzée-Luyssen

zvbi: Don't write in es_format_t::video_format_t when i_cat is SPU

This fixes a crash where we would end up passing VLC_CODEC_TEXT or
VLC_CODEC_RGBA to free()

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

 modules/codec/zvbi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 1941677ba6..f0eaed917b 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -278,9 +278,9 @@ static int Open( vlc_object_t *p_this )
 
     es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_CODEC_SPU );
     if( p_sys->b_text )
-        p_dec->fmt_out.video.i_chroma = VLC_CODEC_TEXT;
+        p_dec->fmt_out.i_codec = VLC_CODEC_TEXT;
     else
-        p_dec->fmt_out.video.i_chroma = VLC_CODEC_RGBA;
+        p_dec->fmt_out.i_codec = VLC_CODEC_RGBA;
 
     p_dec->pf_decode = Decode;
     return VLC_SUCCESS;



More information about the vlc-commits mailing list