OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c61e4b
)
4xm: drop unnecessary check
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Sun, 9 Nov 2014 07:48:40 +0000
(08:48 +0100)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 11 Nov 2014 10:41:49 +0000
(11:41 +0100)
data_size is always >= 0 in this case.
CC: libav-stable@libav.org
Bug-Id: CID
1238788
libavcodec/4xm.c
patch
|
blob
|
history
diff --git
a/libavcodec/4xm.c
b/libavcodec/4xm.c
index
36d9dc1
..
2cecd4d
100644
(file)
--- a/
libavcodec/4xm.c
+++ b/
libavcodec/4xm.c
@@
-820,9
+820,6
@@
static int decode_frame(AVCodecContext *avctx, void *data,
const int data_size = buf_size - 20;
CFrameBuffer *cfrm;
- if (data_size < 0)
- return AVERROR_INVALIDDATA;
-
id = AV_RL32(buf + 12);
whole_size = AV_RL32(buf + 16);