Mercurial > libavformat.hg

changeset 2497:5da824da8e3e libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use assert for conditions that must be true
author conrad
date Wed, 05 Sep 2007 00:25:22 +0000
parents 215eef1f3f37
children b1cd4cd56eed
files matroskaenc.c
diffstat 1 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/matroskaenc.c	Wed Sep 05 00:25:20 2007 +0000
+++ b/matroskaenc.c	Wed Sep 05 00:25:22 2007 +0000
@@ -104,7 +104,7 @@
  */
 static void put_ebml_size_unknown(ByteIOContext *pb, int bytes)
 {
-    bytes = FFMIN(bytes, 8);
+    assert(bytes <= 8);
     put_byte(pb, 0x1ff >> bytes);
     while (--bytes)
         put_byte(pb, 0xff);
@@ -140,14 +140,9 @@
     if (bytes == 0)
         // don't care how many bytes are used, so use the min
         bytes = needed_bytes;
-    else if (needed_bytes > bytes) {
         // the bytes needed to write the given size would exceed the bytes
         // that we need to use, so write unknown size. This shouldn't happen.
-        av_log(NULL, AV_LOG_WARNING, "Size of %" PRIu64 " needs %d bytes but only %d bytes reserved\n",
-               size, needed_bytes, bytes);
-        put_ebml_size_unknown(pb, bytes);
-        return;
-    }
+    assert(bytes >= needed_bytes);
 
     size |= 1ULL << bytes*7;
     for (i = bytes - 1; i >= 0; i--)
@@ -195,8 +190,7 @@
 {
     offset_t currentpos = url_ftell(pb);
 
-    if (size < 2)
-        return;
+    assert(size >= 2);
 
     put_ebml_id(pb, EBML_ID_VOID);
     // we need to subtract the length needed to store the size from the