summaryrefslogtreecommitdiff
path: root/libavcodec/pcm.c
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2008-08-12 12:32:40 +0000
committerPeter Ross <pross@xvid.org>2008-08-12 12:32:40 +0000
commit3b4b113781b6be5a6c03f41e8e26f44872b46316 (patch)
tree396a7f9372fc71577d3da0015cebe0def97e16b1 /libavcodec/pcm.c
parent8d36d36e7446563f39948c9f71491a19e2bc6c87 (diff)
Fix CODEC_ID_PCM_U8 decoder output size calculation to support odd-number of samples.
Originally committed as revision 14712 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/pcm.c')
-rw-r--r--libavcodec/pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 3079a07cae..de1e6c899f 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -411,7 +411,7 @@ static int pcm_decode_frame(AVCodecContext *avctx,
case CODEC_ID_PCM_U8:
memcpy(samples, src, n);
src += n;
- samples += n/2;
+ samples = (short*)((uint8_t*)data + n);
break;
case CODEC_ID_PCM_ZORK:
for(;n>0;n--) {