[vlc-commits] demux: subtitle: don't set encoding

Francois Cartegnie git at videolan.org
Tue Apr 24 13:17:28 CEST 2018


vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Apr 23 16:38:02 2018 +0200| [a68f6e45fefa026f5287c74ebf2214b71978a4fc] | committer: Thomas Guillem

demux: subtitle: don't set encoding

readline converts data

(cherry picked from commit 3af169ca8b172c29dea16aa307e441bed951f399)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 modules/demux/subtitle.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 18508e3aea..83ba0726e5 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -716,8 +716,6 @@ static int Open ( vlc_object_t *p_this )
                  p_demux->psz_location );
     }
 
-    if( psz_bom )
-        fmt.subs.psz_encoding = strdup( psz_bom );
     char *psz_description = var_InheritString( p_demux, "sub-description" );
     if( psz_description && *psz_description )
         fmt.psz_description = psz_description;



More information about the vlc-commits mailing list