generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: don't care about the number of bytes read by ebml_read_element_id()

Browse Source 
Originally committed as revision 14595 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:42:10 +00:00
parent 592110c26c
commit c005b3f224
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/matroskadec.c
View File

@ -527,7 +527,7 @@ static int ebml_read_num(MatroskaDemuxContext *matroska,
/* /*
* Read: the element content data ID. * Read: the element content data ID.
* Return: the number of bytes read or < 0 on error. * 0 is success, < 0 is failure.
*/ */
static int ebml_read_element_id(MatroskaDemuxContext *matroska, uint32_t *id) static int ebml_read_element_id(MatroskaDemuxContext *matroska, uint32_t *id)
{ {
@ -545,7 +545,7 @@ static int ebml_read_element_id(MatroskaDemuxContext *matroska, uint32_t *id)
return read; return read;
*id = matroska->peek_id = total | (1 << (read * 7)); *id = matroska->peek_id = total | (1 << (read * 7));
return read; return 0;
} }
/* /*
@ -908,7 +908,7 @@ static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
void *data, int once) void *data, int once)
{ {
int i, res = 0, res2; int i, res = 0;
uint32_t id = 0; uint32_t id = 0;
for (i=0; syntax[i].id; i++) for (i=0; syntax[i].id; i++)
@ -926,9 +926,8 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
} }
while (!res && !ebml_level_end(matroska)) { while (!res && !ebml_level_end(matroska)) {
res2 = ebml_read_element_id(matroska, &id); res = ebml_read_element_id(matroska, &id);
if (res2 < 0) if (!res)
break;
res = ebml_parse_id(matroska, syntax, id, data); res = ebml_parse_id(matroska, syntax, id, data);
if (once) if (once)
break; break;