git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9942385
)
adx: check for unsupported ADX formats
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sun, 20 Nov 2011 22:07:59 +0000
(17:07 -0500)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Sat, 26 Nov 2011 21:25:07 +0000
(16:25 -0500)
libavcodec/adxdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/adxdec.c
b/libavcodec/adxdec.c
index
f9f17cd
..
ee1f1b0
100644
(file)
--- a/
libavcodec/adxdec.c
+++ b/
libavcodec/adxdec.c
@@
-89,6
+89,12
@@
static int adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
if (bufsize < offset || memcmp(buf + offset - 6, "(c)CRI", 6))
return AVERROR_INVALIDDATA;
+ /* check for encoding=3 block_size=18, sample_size=4 */
+ if (buf[4] != 3 || buf[5] != 18 || buf[6] != 4) {
+ av_log_ask_for_sample(avctx, "unsupported ADX format\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
c->channels = avctx->channels = buf[7];
if (avctx->channels > 2)
return AVERROR_INVALIDDATA;