summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:42:36 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:42:36 +0000
commit1b6d23bbcbeb3bdb44747275295b92495c89ab6d (patch)
tree21eb31127f87ecdfb640a6eb30831466623135af /libavformat/matroskadec.c
parent66cfc3856c0cb1e3e57ae782e77fa5c62b98b26a (diff)
matroskadec: remove now useless wrapper ebml_read_element_length()
Originally committed as revision 14603 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 9d1f03d106..13508b08c9 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) {