Commit 827fe05e authored by Jai Menon's avatar Jai Menon Committed by Jean-Baptiste Kempf

Add support for DivX XSUB subtitle streams.

This close #2383
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit f5b8f4a13fe40151abd54a009049e5d9a6e6780c)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 8460356b
...@@ -67,6 +67,7 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context, ...@@ -67,6 +67,7 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context,
/* */ /* */
switch (codec_id) { switch (codec_id) {
case CODEC_ID_HDMV_PGS_SUBTITLE: case CODEC_ID_HDMV_PGS_SUBTITLE:
case CODEC_ID_XSUB:
break; break;
default: default:
msg_Warn(dec, "refusing to decode non validated subtitle codec"); msg_Warn(dec, "refusing to decode non validated subtitle codec");
......
...@@ -450,6 +450,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -450,6 +450,7 @@ static int Open( vlc_object_t * p_this )
{ {
msg_Dbg( p_demux, "stream[%d] subtitles", i ); msg_Dbg( p_demux, "stream[%d] subtitles", i );
es_format_Init( &fmt, SPU_ES, p_vids->p_bih->biCompression ); es_format_Init( &fmt, SPU_ES, p_vids->p_bih->biCompression );
tk->i_cat = SPU_ES;
break; break;
} }
else if( p_vids->p_bih->biCompression == 0x00 ) else if( p_vids->p_bih->biCompression == 0x00 )
...@@ -1921,6 +1922,7 @@ static void AVI_ParseStreamHeader( vlc_fourcc_t i_id, ...@@ -1921,6 +1922,7 @@ static void AVI_ParseStreamHeader( vlc_fourcc_t i_id,
SET_PTR( pi_type, VIDEO_ES ); SET_PTR( pi_type, VIDEO_ES );
break; break;
case AVITWOCC_tx: case AVITWOCC_tx:
case AVITWOCC_sb:
SET_PTR( pi_type, SPU_ES ); SET_PTR( pi_type, SPU_ES );
break; break;
default: default:
......
...@@ -300,6 +300,8 @@ void AVI_ChunkFreeRoot( stream_t *, avi_chunk_t *p_chk ); ...@@ -300,6 +300,8 @@ void AVI_ChunkFreeRoot( stream_t *, avi_chunk_t *p_chk );
#define AVITWOCC_pc VLC_TWOCC('p','c') #define AVITWOCC_pc VLC_TWOCC('p','c')
#define AVITWOCC_AC VLC_TWOCC('A','C') #define AVITWOCC_AC VLC_TWOCC('A','C')
#define AVITWOCC_tx VLC_TWOCC('t','x') #define AVITWOCC_tx VLC_TWOCC('t','x')
#define AVITWOCC_sb VLC_TWOCC('s','b')
/* *** codex stuff *** */ /* *** codex stuff *** */
/* DV */ /* DV */
......
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