Browse Source

Write unknown size if the size given is too large for EBML (greater than 2^56-1)

Originally committed as revision 10309 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
David Conrad 17 years ago
parent
commit
ffb880c278
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      libavformat/matroskaenc.c

+ 4
- 3
libavformat/matroskaenc.c View File

@@ -46,11 +46,12 @@ static void put_ebml_id(ByteIOContext *pb, unsigned int id)
static void put_ebml_size(ByteIOContext *pb, uint64_t size, int minbytes)
{
int bytes = minbytes;
while (size >> (bytes*7 + 7)) bytes++;

// sizes larger than this are currently undefined in EBML
// XXX: error condition?
if (size > (1ULL<<56)-1) return;
// so write "unknown" size
size = FFMIN(size, (1ULL<<56)-1);

while (size >> (bytes*7 + 7)) bytes++;

put_byte(pb, (0x80 >> bytes) | (size >> bytes*8));
for (bytes -= 1; bytes >= 0; bytes--)


Loading…
Cancel
Save