Commit d894b1b5 authored by Laurent Aimar's avatar Laurent Aimar

Added apple subtitle support to mov demuxer (close #2376).

parent 16c4c21a
...@@ -1438,7 +1438,7 @@ static int MP4_ReadBox_sample_tx3g( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -1438,7 +1438,7 @@ static int MP4_ReadBox_sample_tx3g( stream_t *p_stream, MP4_Box_t *p_box )
MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_right ); MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_right );
#ifdef MP4_VERBOSE #ifdef MP4_VERBOSE
msg_Dbg( p_stream, "read box: \"text\" in stsd text" ); msg_Dbg( p_stream, "read box: \"tx3g\" in stsd text" );
#endif #endif
MP4_READBOX_EXIT( 1 ); MP4_READBOX_EXIT( 1 );
} }
...@@ -2446,6 +2446,7 @@ static int MP4_ReadBox_default( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -2446,6 +2446,7 @@ static int MP4_ReadBox_default( stream_t *p_stream, MP4_Box_t *p_box )
case FOURCC_text: case FOURCC_text:
return MP4_ReadBox_sample_text( p_stream, p_box ); return MP4_ReadBox_sample_text( p_stream, p_box );
case FOURCC_tx3g: case FOURCC_tx3g:
case FOURCC_sbtl:
return MP4_ReadBox_sample_tx3g( p_stream, p_box ); return MP4_ReadBox_sample_tx3g( p_stream, p_box );
default: default:
msg_Warn( p_stream, msg_Warn( p_stream,
......
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
#define FOURCC_text VLC_FOURCC( 't', 'e', 'x', 't' ) #define FOURCC_text VLC_FOURCC( 't', 'e', 'x', 't' )
#define FOURCC_tx3g VLC_FOURCC( 't', 'x', '3', 'g' ) #define FOURCC_tx3g VLC_FOURCC( 't', 'x', '3', 'g' )
#define FOURCC_subp VLC_FOURCC( 's', 'u', 'b', 'p' ) #define FOURCC_subp VLC_FOURCC( 's', 'u', 'b', 'p' )
#define FOURCC_sbtl VLC_FOURCC( 's', 'b', 't', 'l' )
#define FOURCC_0xa9nam VLC_FOURCC( 0xa9, 'n', 'a', 'm' ) #define FOURCC_0xa9nam VLC_FOURCC( 0xa9, 'n', 'a', 'm' )
#define FOURCC_0xa9aut VLC_FOURCC( 0xa9, 'a', 'u', 't' ) #define FOURCC_0xa9aut VLC_FOURCC( 0xa9, 'a', 'u', 't' )
......
...@@ -2124,6 +2124,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, ...@@ -2124,6 +2124,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track,
case( FOURCC_text ): case( FOURCC_text ):
case( FOURCC_subp ): case( FOURCC_subp ):
case( FOURCC_tx3g ): case( FOURCC_tx3g ):
case( FOURCC_sbtl ):
p_track->fmt.i_cat = SPU_ES; p_track->fmt.i_cat = SPU_ES;
break; break;
......
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