Commit cbd9cc59 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/pan: use extended_data instead of data.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8f33810e 6c27aea8
...@@ -370,7 +370,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) ...@@ -370,7 +370,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
if (!outsamples) if (!outsamples)
return AVERROR(ENOMEM); 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); av_frame_copy_props(outsamples, insamples);
outsamples->channel_layout = outlink->channel_layout; outsamples->channel_layout = outlink->channel_layout;
av_frame_set_channels(outsamples, outlink->channels); av_frame_set_channels(outsamples, outlink->channels);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment