diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:42:10 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:42:10 +0000 |
| commit | c005b3f2245d60143e0623c6d75bb7916347f11c (patch) | |
| tree | b4f7ee81a85751696674a00c0ed8abcfdd6dfd87 /libavformat | |
| parent | 592110c26c7ec76a6ab9c350b0ca1e861c33605c (diff) | |
| download | ffmpeg-c005b3f2245d60143e0623c6d75bb7916347f11c.tar.gz | |
matroskadec: don't care about the number of bytes read by ebml_read_element_id()
Originally committed as revision 14595 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroskadec.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index f62cc53f7f..eb2019effd 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -527,7 +527,7 @@ static int ebml_read_num(MatroskaDemuxContext *matroska, /* * 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) { @@ -545,7 +545,7 @@ static int ebml_read_element_id(MatroskaDemuxContext *matroska, uint32_t *id) return read; *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, void *data, int once) { - int i, res = 0, res2; + int i, res = 0; uint32_t id = 0; 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)) { - res2 = ebml_read_element_id(matroska, &id); - if (res2 < 0) - break; + res = ebml_read_element_id(matroska, &id); + if (!res) res = ebml_parse_id(matroska, syntax, id, data); if (once) break; |