diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-09-06 23:44:29 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-09-06 23:44:29 +0000 |
| commit | a3467f86083fa753c0c4b1c02152c3d14b9d151f (patch) | |
| tree | ef286796a077755da24b19b148dd09f08c56ba5f /libavformat | |
| parent | dbfb0e5f362c39faeed830d43d60c27e43c1acfe (diff) | |
matroskadec: remove now useless vstream and is_video_key_frame
Originally committed as revision 15231 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 45cfc507ca..e524261978 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -205,7 +205,6 @@ typedef struct { AVPacket **packets; int num_packets; - AVStream *vstream; int done; int has_cluster_id; @@ -1303,7 +1302,6 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) } 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 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, 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 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, 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 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, } av_free(lace_size); - return res < 0 ? res : is_video_key_frame; + return res; } static int matroska_parse_cluster(MatroskaDemuxContext *matroska) |