diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-10-04 22:44:50 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-10-04 22:44:50 +0000 |
| commit | 1bfbe8ff9d9156ca853b35923bafa116821b6c92 (patch) | |
| tree | 3b5beb171ccd50abc2d47e59f7120356c7c30afd /libavformat/matroskaenc.c | |
| parent | 8401c5140719e66fcf220a1ddd2e89b9dda672b3 (diff) | |
| download | ffmpeg-1bfbe8ff9d9156ca853b35923bafa116821b6c92.tar.gz | |
matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
Originally committed as revision 15559 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 22c5dc06ec..79ea35373e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -710,9 +710,9 @@ static int mkv_write_header(AVFormatContext *s) return 0; } -static int mkv_blockgroup_size(AVPacket *pkt) +static int mkv_blockgroup_size(int pkt_size) { - int size = pkt->size + 4; + int size = pkt_size + 4; size += ebml_num_size(size); size += 2; // EBML ID for block and block duration size += 8; // max size of block duration @@ -775,7 +775,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) if (codec->codec_type != CODEC_TYPE_SUBTITLE) { mkv_write_block(s, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7); } else { - ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt)); + ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt->size)); duration = pkt->convergence_duration; mkv_write_block(s, MATROSKA_ID_BLOCK, pkt, 0); put_ebml_uint(pb, MATROSKA_ID_DURATION, duration); |