diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-07-24 17:18:46 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:14:45 +0200 |
commit | cbe036312a69a3bce4352f50aea09e4ff3f1f8cf (patch) | |
tree | 29806408d460deb7622b8ed46caf8daec5f4a9c8 /vobsub.c | |
parent | 7fe4aa9a3b9bb75177e56668dfe3c416db1b3a2b (diff) | |
download | mpv-cbe036312a69a3bce4352f50aea09e4ff3f1f8cf.tar.bz2 mpv-cbe036312a69a3bce4352f50aea09e4ff3f1f8cf.tar.xz |
vobsub: Only try to merge packets if we have an earlier one stored
Based on patch by 191919 [191919 gmail com].
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31787 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vobsub.c')
-rw-r--r-- | vobsub.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1033,11 +1033,11 @@ void *vobsub_open(const char *const name, const char *const ifo, 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; |