aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-03-11 22:28:03 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-03-11 22:28:03 +0000
commit12f3278dc50273c39c35ea5c154862268b4208bb (patch)
tree45e4f79e46c06f44d488a5a82d40a89aee5e32ff
parent0fb7a2b9bf6b4e06e3864dbe68eefb7bef68df32 (diff)
downloadffmpeg-12f3278dc50273c39c35ea5c154862268b4208bb.tar.gz
reindent after last commit
Originally committed as revision 8330 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/matroska.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 32572c7861..47b99ee745 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -2701,40 +2701,40 @@ matroska_read_packet (AVFormatContext *s,
/* Read stream until we have a packet queued. */
while (matroska_deliver_packet(matroska, pkt)) {
- /* Have we already reached the end? */
- if (matroska->done)
- return AVERROR_IO;
-
- while (res == 0) {
- if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {
+ /* Have we already reached the end? */
+ if (matroska->done)
return AVERROR_IO;
- } else if (matroska->level_up) {
- matroska->level_up--;
- break;
- }
- switch (id) {
- case MATROSKA_ID_CLUSTER:
- if ((res = ebml_read_master(matroska, &id)) < 0)
- break;
- if ((res = matroska_parse_cluster(matroska)) == 0)
- res = 1; /* Parsed one cluster, let's get out. */
+ while (res == 0) {
+ if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {
+ return AVERROR_IO;
+ } else if (matroska->level_up) {
+ matroska->level_up--;
break;
+ }
- default:
- case EBML_ID_VOID:
- res = ebml_read_skip(matroska);
- break;
- }
+ switch (id) {
+ case MATROSKA_ID_CLUSTER:
+ if ((res = ebml_read_master(matroska, &id)) < 0)
+ break;
+ if ((res = matroska_parse_cluster(matroska)) == 0)
+ res = 1; /* Parsed one cluster, let's get out. */
+ break;
- if (matroska->level_up) {
- matroska->level_up--;
- break;
+ default:
+ case EBML_ID_VOID:
+ res = ebml_read_skip(matroska);
+ break;
+ }
+
+ if (matroska->level_up) {
+ matroska->level_up--;
+ break;
+ }
}
- }
- if (res == -1)
- matroska->done = 1;
+ if (res == -1)
+ matroska->done = 1;
}
return 0;