diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-06-11 16:27:30 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-06-11 16:27:30 +0000 |
| commit | 6c58adf3b74b894bb6d3c47323aa4d03fb4995ea (patch) | |
| tree | 17e6312ecfdd43129808c97a8d72ac571735adee | |
| parent | b046c027a71b593d023a357ad22afef33346f8fe (diff) | |
| download | ffmpeg-6c58adf3b74b894bb6d3c47323aa4d03fb4995ea.tar.gz | |
matroskadec: cosmetic: split a line to make it more readable
This also simplifies further modifications.
Originally committed as revision 23586 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6002c9ada0..ca2338d0a6 100644 --- 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, |