[FFmpeg-cvslog] r14603 - trunk/libavformat/matroskadec.c

aurel subversion
Tue Aug 5 02:42:37 CEST 2008


Author: aurel
Date: Tue Aug  5 02:42:36 2008
New Revision: 14603

Log:
matroskadec: remove now useless wrapper ebml_read_element_length()

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Tue Aug  5 02:42:36 2008
@@ -540,17 +540,6 @@ static int ebml_read_element_id(Matroska
 }
 
 /*
- * Read: element content length.
- * Return: the number of bytes read or < 0 on error.
- */
-static int ebml_read_element_length(MatroskaDemuxContext *matroska,
-                                    uint64_t *length)
-{
-    /* read out the "EBML number", include tag in ID */
-    return ebml_read_num(matroska, 8, length);
-}
-
-/*
  * Read the next element as an unsigned int.
  * 0 is success, < 0 is failure.
  */
@@ -843,7 +832,7 @@ static int ebml_parse_elem(MatroskaDemux
     }
 
     if (syntax->type != EBML_PASS && syntax->type != EBML_STOP)
-        if ((res = ebml_read_element_length(matroska, &length)) < 0)
+        if ((res = ebml_read_num(matroska, 8, &length)) < 0)
             return res;
 
     switch (syntax->type) {




More information about the ffmpeg-cvslog mailing list