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

avplay: properly close/reopen AVAudioResampleContext on channel layout change

Browse Source 
fixes Bug#280
This commit is contained in:
Justin Ruggles 2012-05-03 18:57:02 -04:00
parent f132248028
commit 85e5b866dc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avplay.c
View File

@ -2060,15 +2060,17 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
dec->channel_layout != is->resample_channel_layout; dec->channel_layout != is->resample_channel_layout;
if ((!is->avr && audio_resample) || resample_changed) { if ((!is->avr && audio_resample) || resample_changed) {
int ret;
if (is->avr) if (is->avr)
avresample_close(is->avr); avresample_close(is->avr);
else if (audio_resample) { else if (audio_resample) {
int ret;
is->avr = avresample_alloc_context(); is->avr = avresample_alloc_context();
if (!is->avr) { if (!is->avr) {
fprintf(stderr, "error allocating AVAudioResampleContext\n"); fprintf(stderr, "error allocating AVAudioResampleContext\n");
break; break;
} }
}
if (audio_resample) {
av_opt_set_int(is->avr, "in_channel_layout", dec->channel_layout, 0); av_opt_set_int(is->avr, "in_channel_layout", dec->channel_layout, 0);
av_opt_set_int(is->avr, "in_sample_fmt", dec->sample_fmt, 0); av_opt_set_int(is->avr, "in_sample_fmt", dec->sample_fmt, 0);
av_opt_set_int(is->avr, "in_sample_rate", dec->sample_rate, 0); av_opt_set_int(is->avr, "in_sample_rate", dec->sample_rate, 0);