[FFmpeg-soc] [soc]: r395 - matroska/matroskaenc.c
conrad
subversion at mplayerhq.hu
Fri Jul 13 23:37:39 CEST 2007
Author: conrad
Date: Fri Jul 13 23:37:39 2007
New Revision: 395
Log:
Simplify
Modified:
matroska/matroskaenc.c
Modified: matroska/matroskaenc.c
==============================================================================
--- matroska/matroskaenc.c (original)
+++ matroska/matroskaenc.c Fri Jul 13 23:37:39 2007
@@ -525,6 +525,7 @@ static int mkv_write_packet(AVFormatCont
{
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 @@ static int mkv_write_packet(AVFormatCont
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;
}
More information about the FFmpeg-soc
mailing list