aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-02-23 13:11:02 -0500
committerMichael Niedermayer <michaelni@gmx.at>2011-02-26 03:16:02 +0100
commitc11c79222e2d8d1799e768b156808cae90c8d692 (patch)
treeb850c8059cc9063d840a31626fc0bd0460f6d395
parent2ac19b75c0d25f15d33a4f7905be50c7ebbd67fe (diff)
downloadffmpeg-c11c79222e2d8d1799e768b156808cae90c8d692.tar.gz
vmdaudio: output audio samples for standalone silent blocks.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 9b73f786005f31429d7c88092edfeef6696a5f69)
-rw-r--r--libavcodec/vmdav.c2
-rw-r--r--tests/ref/fate/sierra-vmd29
2 files changed, 30 insertions, 1 deletions
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index cbe530dbb4..c6043e94d2 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -534,7 +534,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
*data_size += vmdaudio_loadsound(s, output_samples, p + 4, 0, buf_size - 20);
} else if (buf[6] == 3) {
/* silent chunk */
- *data_size = vmdaudio_loadsound(s, output_samples, p, 1, 0);
+ *data_size = vmdaudio_loadsound(s, output_samples, p, 1, s->block_align);
}
return buf_size;
diff --git a/tests/ref/fate/sierra-vmd b/tests/ref/fate/sierra-vmd
index 4d9e4cdd71..fed4c447d7 100644
--- a/tests/ref/fate/sierra-vmd
+++ b/tests/ref/fate/sierra-vmd
@@ -301,3 +301,32 @@
1, 1890000, 4410, 0x5d2b15f4
1, 1899000, 4410, 0x48764b7c
1, 1908000, 4410, 0x1294e119
+1, 1917000, 4410, 0x00000000
+1, 1926000, 4410, 0x00000000
+1, 1935000, 4410, 0x00000000
+1, 1944000, 4410, 0x00000000
+1, 1953000, 4410, 0x00000000
+1, 1962000, 4410, 0x00000000
+1, 1971000, 4410, 0x00000000
+1, 1980000, 4410, 0x00000000
+1, 1989000, 4410, 0x00000000
+1, 1998000, 4410, 0x00000000
+1, 2007000, 4410, 0x00000000
+1, 2016000, 4410, 0x00000000
+1, 2025000, 4410, 0x00000000
+1, 2034000, 4410, 0x00000000
+1, 2043000, 4410, 0x00000000
+1, 2052000, 4410, 0x00000000
+1, 2061000, 4410, 0x00000000
+1, 2070000, 4410, 0x00000000
+1, 2079000, 4410, 0x00000000
+1, 2088000, 4410, 0x00000000
+1, 2097000, 4410, 0x00000000
+1, 2106000, 4410, 0x00000000
+1, 2115000, 4410, 0x00000000
+1, 2124000, 4410, 0x00000000
+1, 2133000, 4410, 0x00000000
+1, 2142000, 4410, 0x00000000
+1, 2151000, 4410, 0x00000000
+1, 2160000, 4410, 0x00000000
+1, 2169000, 4410, 0x00000000