* Force the UTF-8 encoding on mp4 text subtitles. (Note they can also be UTF-16,...

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 49d399264bbce1a9fc935071cfaec2981e0bdf14..fb06728e6a3890a1e46be272b12fb1465a48458f 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1314,7 +1314,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
             p_track->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
             /* FIXME: Not true, could be UTF-16 with a Byte Order Mark (0xfeff) */
             /* FIXME UTF-8 doesn't work here ? */
-            /* p_track->fmt.subs.psz_encoding = strdup( "UTF-8" ); */
+            p_track->fmt.subs.psz_encoding = strdup( "UTF-8" );
             break;
 
         default: