Mercurial > libavformat.hg
comparison matroska.c @ 1900:55cc48bb357d libavformat
reindent after last commit
| author | aurel |
|---|---|
| date | Sun, 11 Mar 2007 22:28:03 +0000 |
| parents | 1324ae790ee0 |
| children | 3f05dc37b4ec |
comparison
equal
deleted
inserted
replaced
| 1899:1324ae790ee0 | 1900:55cc48bb357d |
|---|---|
| 2699 uint32_t id; | 2699 uint32_t id; |
| 2700 | 2700 |
| 2701 /* Read stream until we have a packet queued. */ | 2701 /* Read stream until we have a packet queued. */ |
| 2702 while (matroska_deliver_packet(matroska, pkt)) { | 2702 while (matroska_deliver_packet(matroska, pkt)) { |
| 2703 | 2703 |
| 2704 /* Have we already reached the end? */ | 2704 /* Have we already reached the end? */ |
| 2705 if (matroska->done) | 2705 if (matroska->done) |
| 2706 return AVERROR_IO; | |
| 2707 | |
| 2708 while (res == 0) { | |
| 2709 if (!(id = ebml_peek_id(matroska, &matroska->level_up))) { | |
| 2710 return AVERROR_IO; | 2706 return AVERROR_IO; |
| 2711 } else if (matroska->level_up) { | 2707 |
| 2712 matroska->level_up--; | 2708 while (res == 0) { |
| 2713 break; | 2709 if (!(id = ebml_peek_id(matroska, &matroska->level_up))) { |
| 2714 } | 2710 return AVERROR_IO; |
| 2715 | 2711 } else if (matroska->level_up) { |
| 2716 switch (id) { | 2712 matroska->level_up--; |
| 2717 case MATROSKA_ID_CLUSTER: | 2713 break; |
| 2718 if ((res = ebml_read_master(matroska, &id)) < 0) | 2714 } |
| 2719 break; | 2715 |
| 2720 if ((res = matroska_parse_cluster(matroska)) == 0) | 2716 switch (id) { |
| 2721 res = 1; /* Parsed one cluster, let's get out. */ | 2717 case MATROSKA_ID_CLUSTER: |
| 2722 break; | 2718 if ((res = ebml_read_master(matroska, &id)) < 0) |
| 2723 | 2719 break; |
| 2724 default: | 2720 if ((res = matroska_parse_cluster(matroska)) == 0) |
| 2725 case EBML_ID_VOID: | 2721 res = 1; /* Parsed one cluster, let's get out. */ |
| 2726 res = ebml_read_skip(matroska); | 2722 break; |
| 2727 break; | 2723 |
| 2728 } | 2724 default: |
| 2729 | 2725 case EBML_ID_VOID: |
| 2730 if (matroska->level_up) { | 2726 res = ebml_read_skip(matroska); |
| 2731 matroska->level_up--; | 2727 break; |
| 2732 break; | 2728 } |
| 2733 } | 2729 |
| 2734 } | 2730 if (matroska->level_up) { |
| 2735 | 2731 matroska->level_up--; |
| 2736 if (res == -1) | 2732 break; |
| 2737 matroska->done = 1; | 2733 } |
| 2734 } | |
| 2735 | |
| 2736 if (res == -1) | |
| 2737 matroska->done = 1; | |
| 2738 } | 2738 } |
| 2739 | 2739 |
| 2740 return 0; | 2740 return 0; |
| 2741 } | 2741 } |
| 2742 | 2742 |