[SCM] libav/experimental: matroskadec: cosmetic: indentation
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:08:35 UTC 2013
The following commit has been merged in the experimental branch:
commit 739178107c431e0d43ec38e9d86352940ee3d1dc
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Fri Jun 11 16:45:38 2010 +0000
matroskadec: cosmetic: indentation
Originally committed as revision 23590 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index a486d24..99c1cf0 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -729,11 +729,11 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
void *data)
{
if (!matroska->current_id) {
- uint64_t id;
- int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id);
- if (res < 0)
- return res;
- matroska->current_id = id | 1 << 7*res;
+ uint64_t id;
+ int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id);
+ if (res < 0)
+ return res;
+ matroska->current_id = id | 1 << 7*res;
}
return ebml_parse_id(matroska, syntax, matroska->current_id, data);
}
@@ -1802,7 +1802,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
matroska->prev_pkt = NULL;
if (matroska->current_id)
pos -= 4; /* sizeof the ID which was already read */
- res = ebml_parse(matroska, matroska_clusters, &cluster);
+ res = ebml_parse(matroska, matroska_clusters, &cluster);
blocks_list = &cluster.blocks;
blocks = blocks_list->elem;
for (i=0; i<blocks_list->nb_elem; i++)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list