highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wavpack: Check error codes rather than working around error conditions.

Browse Source 
(cherry picked from commit dba2b63a98)
This commit is contained in:
Alex Converse
2011-09-08 11:02:43 -07:00
committed by Michael Niedermayer
parent e1baba3ddb
commit 48ba48fb13
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/wavpack.c
View File

@@ -1119,6 +1119,10 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_S32); samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_S32);
else else
samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_FLT); samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
if (samplecount < 0)
return -1;
samplecount >>= 1; samplecount >>= 1;
}else{ }else{
const int channel_stride = avctx->channels; const int channel_stride = avctx->channels;
@@ -1130,11 +1134,14 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
else else
samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_FLT); samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
if (samplecount < 0)
return -1;
if(s->stereo && avctx->sample_fmt == AV_SAMPLE_FMT_S16){ if(s->stereo && avctx->sample_fmt == AV_SAMPLE_FMT_S16){
int16_t *dst = (int16_t*)samples + 1; int16_t *dst = (int16_t*)samples + 1;
int16_t *src = (int16_t*)samples; int16_t *src = (int16_t*)samples;
int cnt = samplecount; int cnt = samplecount;
while(cnt-- > 0){ while(cnt--){
*dst = *src; *dst = *src;
src += channel_stride; src += channel_stride;
dst += channel_stride; dst += channel_stride;
@@ -1143,7 +1150,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
int32_t *dst = (int32_t*)samples + 1; int32_t *dst = (int32_t*)samples + 1;
int32_t *src = (int32_t*)samples; int32_t *src = (int32_t*)samples;
int cnt = samplecount; int cnt = samplecount;
while(cnt-- > 0){ while(cnt--){
*dst = *src; *dst = *src;
src += channel_stride; src += channel_stride;
dst += channel_stride; dst += channel_stride;
@@ -1152,7 +1159,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
float *dst = (float*)samples + 1; float *dst = (float*)samples + 1;
float *src = (float*)samples; float *src = (float*)samples;
int cnt = samplecount; int cnt = samplecount;
while(cnt-- > 0){ while(cnt--){
*dst = *src; *dst = *src;
src += channel_stride; src += channel_stride;
dst += channel_stride; dst += channel_stride;