aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-06-14 12:34:55 +0000
committerMartin Storsjö <martin@martin.st>2010-06-14 12:34:55 +0000
commitf7a30c0baa36df7bc858ffc1bd71152b60972da1 (patch)
tree9274c8d9f088fef22a7fb6032476375276fce74d
parent48e77473e97c2409480cad6be81b5b24468a02b7 (diff)
downloadffmpeg-f7a30c0baa36df7bc858ffc1bd71152b60972da1.tar.gz
nellymoserdec: Allow using unusual input block sizes
Originally committed as revision 23602 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/nellymoserdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 82a3f07950..cda8d11975 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -178,8 +178,12 @@ static int decode_tag(AVCodecContext * avctx,
case 512: // 44100Hz
blocks = 8; break;
default:
+ if (buf_size % 64) {
av_log(avctx, AV_LOG_DEBUG, "Tag size %d.\n", buf_size);
return buf_size;
+ }
+ blocks = buf_size / 64;
+ break;
}
for (i=0 ; i<blocks ; i++) {