OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b046c02
)
matroskadec: cosmetic: split a line to make it more readable
author
Aurelien Jacobs
<aurel@gnuage.org>
Fri, 11 Jun 2010 16:27:30 +0000
(16:27 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Fri, 11 Jun 2010 16:27:30 +0000
(16:27 +0000)
This also simplifies further modifications.
Originally committed as revision 23586 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/matroskadec.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskadec.c
b/libavformat/matroskadec.c
index
6002c9a
..
ca2338d
100644
(file)
--- a/
libavformat/matroskadec.c
+++ b/
libavformat/matroskadec.c
@@
-726,8
+726,10
@@
static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
{
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,