Skip to content

V
vlc-1.1
Commit 48efd637 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Fix the psz_description of telx and vbi streams

parent 42135f8d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
modules/demux/ts.c
View file @ 48efd637
...@@ -2233,6 +2233,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -2233,6 +2233,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
msg_Dbg( p_demux, " * VBI Data descriptor" ); msg_Dbg( p_demux, " * VBI Data descriptor" );
pid->es->fmt.i_cat = SPU_ES; pid->es->fmt.i_cat = SPU_ES;
pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 'd' ); pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 'd' );
pid->es->fmt.psz_description = strdup( "VBI Data" );
pid->es->fmt.i_extra = p_dr->i_length; pid->es->fmt.i_extra = p_dr->i_length;
pid->es->fmt.p_extra = malloc( p_dr->i_length ); pid->es->fmt.p_extra = malloc( p_dr->i_length );
memcpy( pid->es->fmt.p_extra, p_dr->p_data, memcpy( pid->es->fmt.p_extra, p_dr->p_data,
...@@ -2243,6 +2244,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -2243,6 +2244,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
msg_Dbg( p_demux, " * VBI Teletext descriptor" ); msg_Dbg( p_demux, " * VBI Teletext descriptor" );
pid->es->fmt.i_cat = SPU_ES; pid->es->fmt.i_cat = SPU_ES;
pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 't' ); pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 't' );
pid->es->fmt.psz_description = strdup( "VBI Teletext" );
pid->es->fmt.i_extra = p_dr->i_length; pid->es->fmt.i_extra = p_dr->i_length;
pid->es->fmt.p_extra = malloc( p_dr->i_length ); pid->es->fmt.p_extra = malloc( p_dr->i_length );
memcpy( pid->es->fmt.p_extra, p_dr->p_data, memcpy( pid->es->fmt.p_extra, p_dr->p_data,
...@@ -2253,6 +2255,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -2253,6 +2255,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
msg_Dbg( p_demux, " * EBU Teletext descriptor" ); msg_Dbg( p_demux, " * EBU Teletext descriptor" );
pid->es->fmt.i_cat = SPU_ES; pid->es->fmt.i_cat = SPU_ES;
pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' ); pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
pid->es->fmt.psz_description = strdup( "Teletext" );
pid->es->fmt.i_extra = p_dr->i_length; pid->es->fmt.i_extra = p_dr->i_length;
pid->es->fmt.p_extra = malloc( p_dr->i_length ); pid->es->fmt.p_extra = malloc( p_dr->i_length );
memcpy( pid->es->fmt.p_extra, p_dr->p_data, memcpy( pid->es->fmt.p_extra, p_dr->p_data,
......
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