diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:53:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:53:39 +0100 |
| commit | cbd9cc5997ec728a5c92b6cafe57412d5869ec74 (patch) | |
| tree | c6fb052d573ca16eb2e6ebba056730edd811b2da /libavfilter | |
| parent | 8f33810ed26f09a2cac6781008fa174c62dbf35d (diff) | |
| parent | 6c27aea8116303e9c003ff94bbd604db0f7c08e0 (diff) | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/pan: use extended_data instead of data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_pan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index d28f382482..1b78515b55 100644 --- a/libavfilter/af_pan.c +++ b/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); |