int64_t start = ( b_ordered )? *usertime_offset : p_chap->i_start_time;
int64_t stop = ( b_ordered )? ( *usertime_offset + p_chap->i_end_time - p_chap->i_start_time ) : p_chap->i_end_time;
- if( p_chap->p_segment_uid &&
+ if( p_chap->p_segment_uid &&
( !( p_segment = getSegmentbyUID( (KaxSegmentUID*) p_chap->p_segment_uid,segments ) ) || !b_ordered ) )
{
msg_Warn( &p_main_segment->sys.demuxer,
/* Create a virtual edition from opened */
virtual_edition_c * p_vedition = new virtual_edition_c( p_segment->stored_editions[i], p_opened_segments );
- /* Ordered empty edition can happen when all chapters are
+ /* Ordered empty edition can happen when all chapters are
* on an other segment which couldn't be found... ignore it */
if(p_vedition->b_ordered && p_vedition->i_duration == 0)
{
i_current_edition = i;
break;
}
- }
+ }
/* Set current chapter */
p_current_chapter = editions[i_current_edition]->getChapterbyTimecode(0);
return p_chapter->EnterAndLeave( p_item->p_chapter, b_enter );
}
-void virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_offset,
+void virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_offset,
virtual_chapter_c *p_chapter, int64_t i_global_position )
{
demux_sys_t *p_sys = demuxer.p_sys;
}
#if MKV_DEBUG
-void virtual_chapter_c::print()
+void virtual_chapter_c::print()
{
msg_Dbg( &p_segment->sys.demuxer, "*** chapter %"PRId64" - %"PRId64" (%u)",
i_virtual_start_time, i_virtual_stop_time, sub_chapters.size() );
/* Let's only do that for audio and video for now */
if( p_nfmt->i_cat == AUDIO_ES || p_nfmt->i_cat == VIDEO_ES )
{
-
+
/* check for a similar elementary stream */
for( j = 0; j < p_old->tracks.size(); j++)
{
( p_nfmt->i_priority == p_ofmt->i_priority ) &&
( p_nfmt->i_bitrate == p_ofmt->i_bitrate ) &&
( p_nfmt->i_extra == p_ofmt->i_extra ) &&
- ( (!p_nfmt->p_extra && !p_ofmt->p_extra) ||
+ ( (!p_nfmt->p_extra && !p_ofmt->p_extra) ||
!memcmp( p_nfmt->p_extra, p_ofmt->p_extra, p_nfmt->i_extra ) ) &&
!strcasecmp( p_nfmt->psz_language, p_ofmt->psz_language ) &&
- ( ( p_nfmt->i_cat == AUDIO_ES &&
+ ( ( p_nfmt->i_cat == AUDIO_ES &&
!memcmp( &p_nfmt->audio, &p_ofmt->audio, sizeof(audio_format_t) ) ) ||
- ( p_nfmt->i_cat == VIDEO_ES &&
+ ( p_nfmt->i_cat == VIDEO_ES &&
!memcmp( &p_nfmt->video, &p_ofmt->video, sizeof(video_format_t) ) ) ) )
{
/* FIXME handle video palettes... */