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

[aurel]

Author: aurel
Date: Fri Jun 11 18:27:30 2010
New Revision: 23586

Log:
matroskadec: cosmetic: split a line to make it more readable
This also simplifies further modifications.

Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	Fri Jun 11 16:43:24 2010	(r23585)
+++ trunk/libavformat/matroskadec.c	Fri Jun 11 18:27:30 2010	(r23586)
@@ -726,8 +726,10 @@ static int ebml_parse(MatroskaDemuxConte
 {
     uint64_t id;
     int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id);
+    if (res < 0)
+        return res;
     id |= 1 << 7*res;
-    return res < 0 ? res : ebml_parse_id(matroska, syntax, id, data);
+    return ebml_parse_id(matroska, syntax, id, data);
 }
 
 static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,