diff options
| author | David Conrad <lessen42@gmail.com> | 2007-09-05 00:23:53 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2007-09-05 00:23:53 +0000 |
| commit | 9245c5ca085ecd78d0c448fcd8dd884282da8ee1 (patch) | |
| tree | 56766e284fb8be7d31d12b8ead0b3d7fa21d24d3 /libavformat/matroskaenc.c | |
| parent | 56e4540d3aa75b37330043fe716ca01246c6c64c (diff) | |
Simplify
Originally committed as revision 10332 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 feac56d598..94ecbc47ae 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -571,6 +571,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) { MatroskaMuxContext *mkv = s->priv_data; ByteIOContext *pb = &s->pb; + AVCodecContext *codec = s->streams[pkt->stream_index]->codec; int keyframe = !!(pkt->flags & PKT_FLAG_KEY); // start a new cluster every 5 MB or 5 sec @@ -586,7 +587,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) mkv->cluster_pts = pkt->pts; } - if (s->streams[pkt->stream_index]->codec->codec_type != CODEC_TYPE_SUBTITLE) { + if (codec->codec_type != CODEC_TYPE_SUBTITLE) { mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7); } else { offset_t blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP); @@ -595,7 +596,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) end_ebml_master(pb, blockgroup); } - if (s->streams[pkt->stream_index]->codec->codec_type == CODEC_TYPE_VIDEO && keyframe) { + if (codec->codec_type == CODEC_TYPE_VIDEO && keyframe) { if (mkv_add_cuepoint(mkv->cues, pkt, mkv->cluster_pos) < 0) return -1; } |