Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'

[ffmpeg] / libavcodec / adpcm.c

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index bad0be462792c90f0c1a9f6c50c782287d52d18d..2dac23bfa84278f9f9067b9cf4a6bec8990267e0 100644 (file)
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -654,11 +654,9 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb,
         buf_size       -= 8 + 36 * ch;
         buf_size       /= ch;
         nb_samples      = buf_size / 8 * 14;
-        if (buf_size % 8 > 1) {
+        if (buf_size % 8 > 1)
             nb_samples     += (buf_size % 8 - 1) * 2;
-            if (*coded_samples & 1)
-                nb_samples -= 1;
-        }
+        *approx_nb_samples = 1;
         break;
     case AV_CODEC_ID_ADPCM_AFC:
         nb_samples = buf_size / (9 * ch) * 16;