Author: siretart Date: Thu Jul 29 16:28:16 2010 New Revision: 31860 Log: Only try to merge packets if we have a previous packet stored. Based on patch by 191919 [191919 gmail com]. backport r31787 by reimar Modified: branches/1.0rc4/ (props changed) branches/1.0rc4/vobsub.c Modified: branches/1.0rc4/vobsub.c ============================================================================== --- branches/1.0rc4/vobsub.c Thu Jul 29 13:53:03 2010 (r31859) +++ branches/1.0rc4/vobsub.c Thu Jul 29 16:28:16 2010 (r31860) @@ -1033,11 +1033,11 @@ void *vobsub_open(const char *const name last_pts_diff = pkt->pts100 - mpg->pts; else pkt->pts100 = mpg->pts; - if (mpg->merge) { + if (mpg->merge && queue->current_index > 0) { packet_t *last = &queue->packets[queue->current_index - 1]; pkt->pts100 = last->pts100; - mpg->merge = 0; } + mpg->merge = 0; /* FIXME: should not use mpg_sub internal informations, make a copy */ pkt->data = mpg->packet; pkt->size = mpg->packet_size;