Skip to content

V
vlc-2-2
Commit 5850dd13 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

m3u8: correctly deal with BOM (fixes #8859) 

75a167f5 really did not work.
parent dcd24932
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
modules/demux/playlist/m3u.c
View file @ 5850dd13
...@@ -70,8 +70,13 @@ int Import_M3U( vlc_object_t *p_this ) ...@@ -70,8 +70,13 @@ int Import_M3U( vlc_object_t *p_this )
CHECK_PEEK( p_peek, 8 ); CHECK_PEEK( p_peek, 8 );
char *(*pf_dup) (const char *); char *(*pf_dup) (const char *);
if( POKE( p_peek, "\xef\xbb\xbf", 3) )/* BOM at start */
{
pf_dup = CheckUnicode; /* UTF-8 */
stream_Seek( p_demux->s, 3 );
}
else
if( POKE( p_peek, "RTSPtext", 8 ) /* QuickTime */ if( POKE( p_peek, "RTSPtext", 8 ) /* QuickTime */
|| POKE( p_peek, "\xef\xbb\xbf" "#EXTM3U", 10) /* BOM at start */
|| demux_IsPathExtension( p_demux, ".m3u8" ) || demux_IsPathExtension( p_demux, ".m3u8" )
|| demux_IsForced( p_demux, "m3u8" ) || demux_IsForced( p_demux, "m3u8" )
|| CheckContentType( p_demux->s, "application/vnd.apple.mpegurl" ) ) || CheckContentType( p_demux->s, "application/vnd.apple.mpegurl" ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment