[MPlayer-cvslog] CVS: main/libmpdemux demux_mkv.c,1.46,1.47

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv32123

Modified Files:
	demux_mkv.c 
Log Message:
Fixed seeking for AVC-in-Matroska (wrong assumption of what kind of references may be present for a non-I-frame).

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- demux_mkv.c	5 Aug 2005 19:57:46 -0000	1.46
+++ demux_mkv.c	24 Aug 2005 12:33:32 -0000	1.47
@@ -2919,7 +2919,7 @@
   else if (num == demuxer->video->id)
     {
       ds = demuxer->video;
-      if (mkv_d->v_skip_to_keyframe && block_bref != 0)
+      if (mkv_d->v_skip_to_keyframe && (block_bref != 0 || block_fref != 0))
         use_this_block = 0;
     }
   else if (num == demuxer->sub->id)
@@ -2962,7 +2962,7 @@
                   memcpy (dp->buffer, buffer, size);
                   if (modified)
                     free (buffer);
-                  dp->flags = block_bref == 0 ? 1 : 0;
+                  dp->flags = (block_bref == 0 && block_fref == 0) ? 1 : 0;
                   dp->pts = mkv_d->last_pts + i * track->default_duration;
                   ds_add_packet (ds, dp);
                 }