[FFmpeg-cvslog] r14599 - trunk/libavformat/matroskadec.c

aurel subversion
Tue Aug 5 02:42:24 CEST 2008


Author: aurel
Date: Tue Aug  5 02:42:23 2008
New Revision: 14599

Log:
matroskadec: remove now unused once parameter from ebml_parse_nest()

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Tue Aug  5 02:42:23 2008
@@ -849,7 +849,7 @@ static int matroska_probe(AVProbeData *p
 static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
                          uint32_t id, void *data);
 static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
-                      void *data, int once);
+                           void *data);
 
 static int ebml_parse_elem(MatroskaDemuxContext *matroska,
                            EbmlSyntax *syntax, void *data)
@@ -882,7 +882,7 @@ static int ebml_parse_elem(MatroskaDemux
                          return res;
                      if (id == MATROSKA_ID_SEGMENT)
                          matroska->segment_start = url_ftell(matroska->ctx->pb);
-                     return ebml_parse_nest(matroska, syntax->def.n, data, 0);
+                     return ebml_parse_nest(matroska, syntax->def.n, data);
     case EBML_PASS:  return ebml_parse_id(matroska, syntax->def.n, id, data);
     case EBML_STOP:  *(int *)data = 1;      return 1;
     default:         url_fskip(pb, length); return 0;
@@ -915,7 +915,7 @@ static int ebml_parse(MatroskaDemuxConte
 }
 
 static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
-                      void *data, int once)
+                           void *data)
 {
     int i, res = 0;
 
@@ -933,11 +933,8 @@ static int ebml_parse_nest(MatroskaDemux
             break;
         }
 
-    while (!res && !ebml_level_end(matroska)) {
+    while (!res && !ebml_level_end(matroska))
         res = ebml_parse(matroska, syntax, data);
-        if (once)
-            break;
-    }
 
     return res;
 }




More information about the ffmpeg-cvslog mailing list