MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swr: make sure the last data element is NULL so we can use it to detect the number of channels 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-24 22:52:36 +02:00
parent 5dc7363446
commit 97599f8c6d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libswresample/audioconvert.c
View File

@ -179,6 +179,7 @@ int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len
off = len&~15;
av_assert1(off>=0);
av_assert1(off<=len);
av_assert2(ctx->channels == SWR_CH_MAX || !in->ch[ctx->channels]);
if(off>0){
if(out->planar == in->planar){
int planes = out->planar ? out->ch_count : 1;

2
libswresample/swresample.c
View File

@ -214,6 +214,8 @@ av_cold int swr_init(struct SwrContext *s){
free_temp(&s->preout);
free_temp(&s->in_buffer);
free_temp(&s->dither);
memset(s->in.ch, 0, sizeof(s->in.ch));
memset(s->out.ch, 0, sizeof(s->out.ch));
swri_audio_convert_free(&s-> in_convert);
swri_audio_convert_free(&s->out_convert);
swri_audio_convert_free(&s->full_convert);