projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db27dad
)
sonic: cleanup/simplify num_taps check
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 23 Jun 2013 17:44:24 +0000
(19:44 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 23 Jun 2013 17:44:24 +0000
(19:44 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sonic.c
patch
|
blob
|
history
diff --git
a/libavcodec/sonic.c
b/libavcodec/sonic.c
index
716d68a
..
788bea6
100644
(file)
--- a/
libavcodec/sonic.c
+++ b/
libavcodec/sonic.c
@@
-527,9
+527,7
@@
static av_cold int sonic_encode_init(AVCodecContext *avctx)
}
// max tap 2048
- if ((s->num_taps < 32) || (s->num_taps > 1024) ||
- ((s->num_taps>>5)<<5 != s->num_taps))
- {
+ if (s->num_taps < 32 || s->num_taps > 1024 || s->num_taps % 32) {
av_log(avctx, AV_LOG_ERROR, "Invalid number of taps\n");
return AVERROR_INVALIDDATA;
}