[vlc-commits] zvbi: Simplify fmt_out initialization

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Jun 16 15:27:29 2017 +0200| [3c0a8a5064e0d0584955ddc4a75f734e8dfd6b4f] | committer: Hugo Beauzée-Luyssen

zvbi: Simplify fmt_out initialization

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

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

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index fe0439ab90..4b72c0cbaf 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -276,11 +276,8 @@ static int Open( vlc_object_t *p_this )
     /* Listen for keys */
     var_AddCallback( p_dec->obj.libvlc, "key-pressed", EventKey, p_dec );
 
-    es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_CODEC_SPU );
-    if( p_sys->b_text )
-        p_dec->fmt_out.i_codec = VLC_CODEC_TEXT;
-    else
-        p_dec->fmt_out.i_codec = VLC_CODEC_RGBA;
+    es_format_Init( &p_dec->fmt_out, SPU_ES,
+                    p_sys->b_text ? VLC_CODEC_TEXT : VLC_CODEC_RGBA );
 
     p_dec->pf_decode = Decode;
     return VLC_SUCCESS;