Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

af_aresample: use extended_data

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/30/merge
Michael Niedermayer 13 years ago
parent 72a242c998
commit e17a039647
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavfilter/af_aresample.c

6
libavfilter/af_aresample.c
Unescape View File

@ -169,8 +169,8 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamplesref
AVFilterLink *const outlink = inlink->dst->outputs[0]; AVFilterLink *const outlink = inlink->dst->outputs[0];
AVFilterBufferRef *outsamplesref = ff_get_audio_buffer(outlink, AV_PERM_WRITE, n_out); AVFilterBufferRef *outsamplesref = ff_get_audio_buffer(outlink, AV_PERM_WRITE, n_out);
n_out = swr_convert(aresample->swr, outsamplesref->data, n_out, n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out,
(void *)insamplesref->data, n_in); (void *)insamplesref->extended_data, n_in);
if (n_out <= 0) { if (n_out <= 0) {
avfilter_unref_buffer(outsamplesref); avfilter_unref_buffer(outsamplesref);
avfilter_unref_buffer(insamplesref); avfilter_unref_buffer(insamplesref);
@ -210,7 +210,7 @@ static int request_frame(AVFilterLink *outlink)
outsamplesref = ff_get_audio_buffer(outlink, AV_PERM_WRITE, n_out); outsamplesref = ff_get_audio_buffer(outlink, AV_PERM_WRITE, n_out);
if (!outsamplesref) if (!outsamplesref)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
n_out = swr_convert(aresample->swr, outsamplesref->data, n_out, 0, 0); n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, 0, 0);
if (n_out <= 0) { if (n_out <= 0) {
avfilter_unref_buffer(outsamplesref); avfilter_unref_buffer(outsamplesref);
return (n_out == 0) ? AVERROR_EOF : n_out; return (n_out == 0) ? AVERROR_EOF : n_out;

Write Preview
Loading…
Cancel
Save