diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 02:49:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 02:49:48 +0200 |
| commit | c62fea75747de132d69cdf8504ab6c8af26fa307 (patch) | |
| tree | aa43d49d22eff48477167fd9aa359637015b7185 /libavresample/audio_convert.c | |
| parent | 8f6d36b3cb8e3afc6cfa3abb1582ec4d71a3e1ee (diff) | |
| parent | fbc0b8659967ea54a8472b5f795270d38bb085dd (diff) | |
| download | ffmpeg-c62fea75747de132d69cdf8504ab6c8af26fa307.tar.gz | |
Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'
* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
lavr: Do not change the sample format for mono audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.c')
| -rw-r--r-- | libavresample/audio_convert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c index e68d5727f4..c3e9aa3da9 100644 --- a/libavresample/audio_convert.c +++ b/libavresample/audio_convert.c @@ -288,8 +288,8 @@ AudioConvert *ff_audio_convert_alloc(AVAudioResampleContext *avr, return ac; } - in_planar = av_sample_fmt_is_planar(in_fmt); - out_planar = av_sample_fmt_is_planar(out_fmt); + in_planar = ff_sample_fmt_is_planar(in_fmt, channels); + out_planar = ff_sample_fmt_is_planar(out_fmt, channels); if (in_planar == out_planar) { ac->func_type = CONV_FUNC_TYPE_FLAT; |