From ffb880c278a4e28abd785824fe7b10b558f9942f Mon Sep 17 00:00:00 2001 From: David Conrad Date: Wed, 5 Sep 2007 00:23:06 +0000 Subject: [PATCH] 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 --- libavformat/matroskaenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 44df0b6744..41b9d6b06a 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -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--)