highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'

Browse Source 
* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
  lavr: Update the planar check in ff_audio_convert

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-17 21:42:49 +02:00
commit c939eea107
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavresample/audio_convert.c
View File

@ -345,13 +345,13 @@ int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in)
if (ac->apply_map) { if (ac->apply_map) {
ChannelMapInfo *map = &ac->avr->ch_map_info; 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"); av_log(ac->avr, AV_LOG_ERROR, "cannot remap packed format during conversion\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (map->do_remap) { 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 : conv_func_flat *convert = use_generic ? ac->conv_flat_generic :
ac->conv_flat; ac->conv_flat;