summaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-17 21:42:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-17 21:43:06 +0200
commitc939eea107c36b4ab93540f24fdb1cb5417a0eae (patch)
tree3414c8aff3addad4af63001d3689f1b1ca11a51a /libavresample
parenteb706575baa646d3d2400d85a521386a4df3d979 (diff)
parent11db644a8e54f02e54d2eaad343a87fcb697c15e (diff)
downloadffmpeg-streaming-c939eea107c36b4ab93540f24fdb1cb5417a0eae.zip
ffmpeg-streaming-c939eea107c36b4ab93540f24fdb1cb5417a0eae.tar.gz
Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'
* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e': lavr: Update the planar check in ff_audio_convert Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/audio_convert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c
index c3e9aa3..5629034 100644
--- a/libavresample/audio_convert.c
+++ b/libavresample/audio_convert.c
@@ -345,13 +345,13 @@ int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in)
if (ac->apply_map) {
ChannelMapInfo *map = &ac->avr->ch_map_info;
- if (!av_sample_fmt_is_planar(ac->out_fmt)) {
+ if (!ff_sample_fmt_is_planar(ac->out_fmt, ac->channels)) {
av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
return AVERROR(EINVAL);
}
if (map->do_remap) {
- if (av_sample_fmt_is_planar(ac->in_fmt)) {
+ if (ff_sample_fmt_is_planar(ac->in_fmt, ac->channels)) {
conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
ac->conv_flat;
OpenPOWER on IntegriCloud