diff options
| author | David Conrad <lessen42@gmail.com> | 2007-09-05 00:23:38 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2007-09-05 00:23:38 +0000 |
| commit | 357eba6f0b726ae9b5056af99fb58b569bee3098 (patch) | |
| tree | 4672004add69eff639fa2c40dbe7f05d26ee3d67 /libavformat/matroskaenc.c | |
| parent | d22f88cb1960f5b7b498ca162fd6afc35bacac8b (diff) | |
| download | ffmpeg-357eba6f0b726ae9b5056af99fb58b569bee3098.tar.gz | |
Simplify
Originally committed as revision 10324 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 074f1b7b47..571d6aa89b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -525,6 +525,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) { 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(AVFormatContext *s, AVPacket *pkt) 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; } |