xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-23 05:40:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

matroskadec: expand useless ebml_peek_id() wrapper

Browse Source 
Originally committed as revision 14587 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:41:46 +00:00
parent 3856e7c4aa
commit 4dc9e183dd
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavformat/matroskadec.c
View File

@ -576,28 +576,6 @@ ebml_read_element_length (MatroskaDemuxContext *matroska,
return ebml_read_num(matroska, 8, length);
}
/*
* Return: the ID of the next element, or 0 on error.
* Level_up contains the amount of levels that this
* next element lies higher than the previous one.
*/
static uint32_t
ebml_peek_id (MatroskaDemuxContext *matroska,
int *level_up)
{
uint32_t id;
int res;
res = ebml_read_element_id(matroska, &id);
if (res < 0)
return 0;
if (res > 0 && level_up)
*level_up = ebml_read_element_level_up(matroska);
return id;
}
/*
* Seek to a given offset.
* 0 is success, -1 is failure.
@ -1045,7 +1023,7 @@ static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
void *data, uint32_t expected_id, int once)
{
int i, res = 0;
int i, res = 0, res2;
uint32_t id = 0;
for (i=0; syntax[i].id; i++)
@ -1071,10 +1049,12 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
}
while (!res) {
if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {
res = AVERROR(EIO);
res2 = ebml_read_element_id(matroska, &id);
if (res2 < 0)
break;
} else if (matroska->level_up) {
if (res2 > 0)
matroska->level_up = ebml_read_element_level_up(matroska);
if (matroska->level_up) {
matroska->level_up--;
break;
}