[SCM] libav/experimental: matroskadec: remove now useless wrapper ebml_read_element_length()
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:26:53 UTC 2013
The following commit has been merged in the experimental branch:
commit 1b6d23bbcbeb3bdb44747275295b92495c89ab6d
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Tue Aug 5 00:42:36 2008 +0000
matroskadec: remove now useless wrapper ebml_read_element_length()
Originally committed as revision 14603 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 9d1f03d..13508b0 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -540,17 +540,6 @@ static int ebml_read_element_id(MatroskaDemuxContext *matroska, uint32_t *id)
}
/*
- * 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(MatroskaDemuxContext *matroska,
}
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) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list