Mercurial > libavformat.hg

changeset 3899:5901b4ccda4a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
matroskadec: remove now useless vstream and is_video_key_frame
author aurel
date Sat, 06 Sep 2008 23:44:29 +0000
parents da23c86d54ec
children 4703ed97ea9d
files matroskadec.c
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/matroskadec.c	Sat Sep 06 23:43:24 2008 +0000
+++ b/matroskadec.c	Sat Sep 06 23:44:29 2008 +0000
@@ -205,7 +205,6 @@
     AVPacket **packets;
     int num_packets;
 
-    AVStream *vstream;
     int done;
     int has_cluster_id;
 
@@ -1303,7 +1302,6 @@
         }
 
         if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
-            if (!matroska->vstream)  matroska->vstream = st;
             st->codec->codec_type = CODEC_TYPE_VIDEO;
             st->codec->codec_tag  = track->video.fourcc;
             st->codec->width  = track->video.pixel_width;
@@ -1424,7 +1422,7 @@
                                 int64_t cluster_pos)
 {
     MatroskaTrack *track;
-    int is_video_key_frame = is_keyframe, res = 0;
+    int res = 0;
     AVStream *st;
     AVPacket *pkt;
     int16_t block_time;
@@ -1464,8 +1462,6 @@
         matroska->skip_to_keyframe = 0;
     }
 
-    is_video_key_frame &= st == matroska->vstream;
-
     switch ((flags & 0x06) >> 1) {
         case 0x0: /* no lacing */
             laces = 1;
@@ -1638,7 +1634,7 @@
     }
 
     av_free(lace_size);
-    return res < 0 ? res : is_video_key_frame;
+    return res;
 }
 
 static int matroska_parse_cluster(MatroskaDemuxContext *matroska)