[FFmpeg-cvslog] nellymoserdec: use NELLY_BLOCK_LEN instead of 64 when appropriate.

Justin Ruggles git at videolan.org
Mon Oct 3 01:17:03 CEST 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Wed Sep 14 12:27:12 2011 -0400| [ded0800d44662391995a3c00b6c136fb781fee6b] | committer: Justin Ruggles

nellymoserdec: use NELLY_BLOCK_LEN instead of 64 when appropriate.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ded0800d44662391995a3c00b6c136fb781fee6b
---

 libavcodec/nellymoserdec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index a6748bf..bd3ab99 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -170,13 +170,13 @@ static int decode_tag(AVCodecContext * avctx,
         return buf_size;
     }
 
-    if (buf_size % 64) {
+    if (buf_size % NELLY_BLOCK_LEN) {
         av_log(avctx, AV_LOG_ERROR, "Tag size %d.\n", buf_size);
         *data_size = 0;
         return buf_size;
     }
     block_size = NELLY_SAMPLES * av_get_bytes_per_sample(avctx->sample_fmt);
-    blocks     = FFMIN(buf_size / 64, *data_size / block_size);
+    blocks     = FFMIN(buf_size / NELLY_BLOCK_LEN, *data_size / block_size);
     if (blocks <= 0) {
         av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
         return AVERROR(EINVAL);



More information about the ffmpeg-cvslog mailing list