Skip to content

V
vlc-1.1
Commit 763f49fb authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* mp4: convert all \r to \n in subt.

parent 41683118
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
modules/demux/mp4/mp4.c
View file @ 763f49fb
...@@ -590,10 +590,17 @@ static int Demux( demux_t *p_demux ) ...@@ -590,10 +590,17 @@ static int Demux( demux_t *p_demux )
if( i_size + 2 <= p_block->i_buffer ) if( i_size + 2 <= p_block->i_buffer )
{ {
char *p;
/* remove the length field, and append a '\0' */ /* remove the length field, and append a '\0' */
memmove( &p_block->p_buffer[0], &p_block->p_buffer[2], i_size ); memmove( &p_block->p_buffer[0], &p_block->p_buffer[2], i_size );
p_block->p_buffer[i_size] = '\0'; p_block->p_buffer[i_size] = '\0';
p_block->i_buffer = i_size + 1; p_block->i_buffer = i_size + 1;
/* convert \r -> \n */
while( ( p = strchr( p_block->p_buffer, '\r' ) ) )
{
*p = '\n';
}
} }
else else
{ {
...@@ -1108,6 +1115,9 @@ static int TrackCreateES ( demux_t *p_demux, ...@@ -1108,6 +1115,9 @@ static int TrackCreateES ( demux_t *p_demux,
case( VLC_FOURCC( 't', 'e', 'x', 't' ) ): case( VLC_FOURCC( 't', 'e', 'x', 't' ) ):
p_track->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); 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" ); */
break; break;
default: default:
......
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