# HG changeset patch # User aurel # Date 1217896953 0 # Node ID 1332d68c8210f75c6a44e1a973bb3c3677a32cf7 # Parent 495728a85fe6528c9ab5bb76981893b5f56a34f0 matroskadec: remove now useless wrapper ebml_read_seek() diff -r 495728a85fe6 -r 1332d68c8210 matroskadec.c --- a/matroskadec.c Tue Aug 05 00:42:29 2008 +0000 +++ b/matroskadec.c Tue Aug 05 00:42:33 2008 +0000 @@ -551,17 +551,6 @@ } /* - * Seek to a given offset. - * 0 is success, -1 is failure. - */ -static int ebml_read_seek(MatroskaDemuxContext *matroska, offset_t offset) -{ - ByteIOContext *pb = matroska->ctx->pb; - - return (url_fseek(pb, offset, SEEK_SET) == offset) ? 0 : -1; -} - -/* * Read the next element as an unsigned int. * 0 is success, < 0 is failure. */ @@ -1034,14 +1023,15 @@ int i; for (i=0; inb_elem; i++) { + offset_t offset = seekhead[i].pos + matroska->segment_start; + if (seekhead[i].pos <= before_pos || seekhead[i].id == MATROSKA_ID_SEEKHEAD || seekhead[i].id == MATROSKA_ID_CLUSTER) continue; /* seek */ - if (ebml_read_seek(matroska, - seekhead[i].pos+matroska->segment_start) < 0) + if (url_fseek(matroska->ctx->pb, offset, SEEK_SET) != offset) continue; /* we don't want to lose our seekhead level, so we add @@ -1069,7 +1059,7 @@ } /* seek back */ - ebml_read_seek(matroska, before_pos); + url_fseek(matroska->ctx->pb, before_pos, SEEK_SET); matroska->level_up = level_up; }