# HG changeset patch # User conrad # Date 1188951818 0 # Node ID 5589c058b0f9c8aa9f73e3cc8094314cf6d8fc74 # Parent ad38b19b0f1ae57656a48091b140ff87eb871a85 Simplify diff -r ad38b19b0f1a -r 5589c058b0f9 matroskaenc.c --- a/matroskaenc.c Wed Sep 05 00:23:34 2007 +0000 +++ b/matroskaenc.c Wed Sep 05 00:23:38 2007 +0000 @@ -525,6 +525,7 @@ { MatroskaMuxContext *mkv = s->priv_data; ByteIOContext *pb = &s->pb; + int keyframe = !!(pkt->flags & PKT_FLAG_KEY); // start a new cluster every 5 MB or 5 sec if (url_ftell(pb) > mkv->cluster + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) { @@ -543,10 +544,10 @@ put_ebml_size(pb, pkt->size + 4, 0); put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126 put_be16(pb, pkt->pts - mkv->cluster_pts); - put_byte(pb, !!(pkt->flags & PKT_FLAG_KEY)); + put_byte(pb, keyframe); put_buffer(pb, pkt->data, pkt->size); - if (s->streams[pkt->stream_index]->codec->codec_type == CODEC_TYPE_VIDEO && pkt->flags & PKT_FLAG_KEY) { + if (s->streams[pkt->stream_index]->codec->codec_type == CODEC_TYPE_VIDEO && keyframe) { if (mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos) < 0) return -1; }