From 1b6d23bbcbeb3bdb44747275295b92495c89ab6d Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Tue, 5 Aug 2008 00:42:36 +0000 Subject: [PATCH] matroskadec: remove now useless wrapper ebml_read_element_length() Originally committed as revision 14603 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskadec.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 9d1f03d106..13508b08c9 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -539,17 +539,6 @@ static int ebml_read_element_id(MatroskaDemuxContext *matroska, uint32_t *id) return 0; } -/* - * 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) {