Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/pan: use extended_data instead of data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/56/merge
Michael Niedermayer 11 years ago
commit cbd9cc5997
  1. 3
      libavfilter/af_pan.c

@ -370,7 +370,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
if (!outsamples)
return AVERROR(ENOMEM);
swr_convert(pan->swr, outsamples->data, n, (void *)insamples->data, n);
swr_convert(pan->swr, outsamples->extended_data, n,
(void *)insamples->extended_data, n);
av_frame_copy_props(outsamples, insamples);
outsamples->channel_layout = outlink->channel_layout;
av_frame_set_channels(outsamples, outlink->channels);

Loading…
Cancel
Save