virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

give s->resample_context to avoid segfault, avclass was moved

Browse Source 
Originally committed as revision 19150 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-06-11 08:14:50 +00:00
parent 77fc598d98
commit 89bc05d1ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/resample.c
View File

@ -257,7 +257,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
s->buffer_size[0] = input_size; s->buffer_size[0] = input_size;
s->buffer[0] = av_malloc(s->buffer_size[0]); s->buffer[0] = av_malloc(s->buffer_size[0]);
if (!s->buffer[0]) { if (!s->buffer[0]) {
av_log(s, AV_LOG_ERROR, "Could not allocate buffer\n"); av_log(s->resample_context, AV_LOG_ERROR, "Could not allocate buffer\n");
return 0; return 0;
} }
} }
@ -266,7 +266,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
if (av_audio_convert(s->convert_ctx[0], obuf, ostride, if (av_audio_convert(s->convert_ctx[0], obuf, ostride,
ibuf, istride, nb_samples*s->input_channels) < 0) { ibuf, istride, nb_samples*s->input_channels) < 0) {
av_log(s, AV_LOG_ERROR, "Audio sample format conversion failed\n"); av_log(s->resample_context, AV_LOG_ERROR, "Audio sample format conversion failed\n");
return 0; return 0;
} }
@ -283,7 +283,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
s->buffer_size[1] = lenout; s->buffer_size[1] = lenout;
s->buffer[1] = av_malloc(s->buffer_size[1]); s->buffer[1] = av_malloc(s->buffer_size[1]);
if (!s->buffer[1]) { if (!s->buffer[1]) {
av_log(s, AV_LOG_ERROR, "Could not allocate buffer\n"); av_log(s->resample_context, AV_LOG_ERROR, "Could not allocate buffer\n");
return 0; return 0;
} }
} }
@ -348,7 +348,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
if (av_audio_convert(s->convert_ctx[1], obuf, ostride, if (av_audio_convert(s->convert_ctx[1], obuf, ostride,
ibuf, istride, nb_samples1*s->output_channels) < 0) { ibuf, istride, nb_samples1*s->output_channels) < 0) {
av_log(s, AV_LOG_ERROR, "Audio sample format convertion failed\n"); av_log(s->resample_context, AV_LOG_ERROR, "Audio sample format convertion failed\n");
return 0; return 0;
} }
} }