Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:16:13 +0000 (09:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Jun 2013 07:16:13 +0000 (09:16 +0200)
* commit '8835c554ff506992c47f6e347c74216ae073f0fa':
  matroskadec: introduce resync function.

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/matroskadec.c

@@@ -635,14 -571,13 +635,13 @@@ static int matroska_resync(MatroskaDemu
      id = avio_rb32(pb);
  
      // try to find a toplevel element
 -    while (!pb->eof_reached) {
 +    while (!url_feof(pb)) {
-         if (id == MATROSKA_ID_INFO || id == MATROSKA_ID_TRACKS ||
-             id == MATROSKA_ID_CUES || id == MATROSKA_ID_TAGS ||
+         if (id == MATROSKA_ID_INFO     || id == MATROSKA_ID_TRACKS      ||
+             id == MATROSKA_ID_CUES     || id == MATROSKA_ID_TAGS        ||
              id == MATROSKA_ID_SEEKHEAD || id == MATROSKA_ID_ATTACHMENTS ||
-             id == MATROSKA_ID_CLUSTER || id == MATROSKA_ID_CHAPTERS)
-         {
-             matroska->current_id = id;
-             return 0;
+             id == MATROSKA_ID_CLUSTER  || id == MATROSKA_ID_CHAPTERS) {
+                 matroska->current_id = id;
+                 return 0;
          }
          id = (id << 8) | avio_r8(pb);
      }