Commit 7ba6a7f5 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

mkv: Fix track format initialization

parent b6156e1b
...@@ -220,15 +220,16 @@ void matroska_segment_c::ParseTrackEntry( const KaxTrackEntry *m ) ...@@ -220,15 +220,16 @@ void matroska_segment_c::ParseTrackEntry( const KaxTrackEntry *m )
es_format_Init( &track.fmt, AUDIO_ES, 0); es_format_Init( &track.fmt, AUDIO_ES, 0);
track.fmt.audio.i_channels = 1; track.fmt.audio.i_channels = 1;
track.fmt.audio.i_rate = 8000; track.fmt.audio.i_rate = 8000;
track.fmt.psz_language = strdup("English");
break; break;
case track_video: case track_video:
es_format_Init( &track.fmt, VIDEO_ES, 0); es_format_Init( &track.fmt, VIDEO_ES, 0);
track.fmt.psz_language = strdup("English");
break; break;
case track_subtitle: case track_subtitle:
es_format_Init( &track.fmt, SPU_ES, 0);
break;
case track_buttons: case track_buttons:
es_format_Init( &track.fmt, SPU_ES, 0); es_format_Init( &track.fmt, SPU_ES, 0);
track.fmt.psz_language = strdup("English");
break; break;
default: default:
es_format_Init( &track.fmt, UNKNOWN_ES, 0); es_format_Init( &track.fmt, UNKNOWN_ES, 0);
......
...@@ -212,9 +212,7 @@ class mkv_track_t ...@@ -212,9 +212,7 @@ class mkv_track_t
,i_seek_preroll(0) ,i_seek_preroll(0)
,i_codec_delay(0) ,i_codec_delay(0)
{ {
std::memset( &fmt, 0, sizeof( fmt ) );
std::memset( &pi_chan_table, 0, sizeof( pi_chan_table ) ); std::memset( &pi_chan_table, 0, sizeof( pi_chan_table ) );
fmt.psz_language = strdup("English");
} }
typedef unsigned int track_id_t; typedef unsigned int track_id_t;
......
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