aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-05-28 21:22:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-05-28 21:22:08 +0000
commit9bf8b5621a49cdbddd79529e785ab81f98ffcbe7 (patch)
tree0a58bfbce0d9e7f98a702c6829cb274898c78ca8
parent5e8782dddf957a5c4f2b79e1a793287cad454660 (diff)
downloadffmpeg-9bf8b5621a49cdbddd79529e785ab81f98ffcbe7.tar.gz
Dead code removal, fixes CID59 RUN2.
Originally committed as revision 13509 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/matroskadec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 6f6caa169d..f080bd1cd3 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2758,10 +2758,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
case 0x1: /* xiph lacing */
case 0x2: /* fixed-size lacing */
case 0x3: /* EBML lacing */
- if (size == 0) {
- res = -1;
- break;
- }
+ assert(size>0); // size <=3 is checked before size-=3 above
laces = (*data) + 1;
data += 1;
size -= 1;