From 6b9a10fbd352b61c286b732f9aa67f0d2f0a1301 Mon Sep 17 00:00:00 2001 From: David Conrad Date: Wed, 5 Sep 2007 00:23:41 +0000 Subject: Simplify Originally committed as revision 10326 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskaenc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 38ee9d6f90..80c89b4c77 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -76,13 +76,7 @@ static void put_ebml_id(ByteIOContext *pb, unsigned int id) static int ebml_id_size(unsigned int id) { - if (id >= 0x3fffff) - return 4; - if (id >= 0x7fff) - return 3; - if (id >= 0xff) - return 2; - return 1; + return (av_log2(id+1)-1)/7+1; } // XXX: test this thoroughly and get rid of minbytes hack (currently needed to -- cgit v1.2.3