virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

matroskaenc: remove useless mkv_block_size() function

Browse Source 
Originally committed as revision 15558 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-10-04 22:41:58 +00:00
parent 7ccc636f03
commit 8401c51407
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/matroskaenc.c
View File

@ -710,15 +710,9 @@ static int mkv_write_header(AVFormatContext *s)
return 0; return 0;
} }
static int mkv_block_size(AVPacket *pkt)
{
int size = 4; // track num + timecode + flags
return size + pkt->size;
}
static int mkv_blockgroup_size(AVPacket *pkt) static int mkv_blockgroup_size(AVPacket *pkt)
{ {
int size = mkv_block_size(pkt); int size = pkt->size + 4;
size += ebml_num_size(size); size += ebml_num_size(size);
size += 2; // EBML ID for block and block duration size += 2; // EBML ID for block and block duration
size += 8; // max size of block duration size += 8; // max size of block duration
@ -736,7 +730,7 @@ static void mkv_write_block(AVFormatContext *s, unsigned int blockid, AVPacket *
"pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n", "pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n",
url_ftell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags); url_ftell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags);
put_ebml_id(pb, blockid); put_ebml_id(pb, blockid);
put_ebml_num(pb, mkv_block_size(pkt), 0); put_ebml_num(pb, pkt->size+4, 0);
put_byte(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126 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_be16(pb, pkt->pts - mkv->cluster_pts);
put_byte(pb, flags); put_byte(pb, flags);