diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-10-05 06:56:00 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-10-05 13:49:44 +0200 |
| commit | e7ba5b1de063e9b1de441b0d1c5708857f739fa5 (patch) | |
| tree | 05490f4e375f626b667dfdb230d23266e39cdb0b /libavfilter | |
| parent | 30223b3bf2ab1c55499d3d52a244221d24fcc784 (diff) | |
| download | ffmpeg-e7ba5b1de063e9b1de441b0d1c5708857f739fa5.tar.gz | |
lavr: change the type of the data buffers to uint8_t**.
This is more consistent with what the rest of Libav does.
This breaks API.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_asyncts.c | 8 | ||||
| -rw-r--r-- | libavfilter/af_resample.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index 0b8be8d557..c7eb86dd77 100644 --- a/libavfilter/af_asyncts.c +++ b/libavfilter/af_asyncts.c @@ -133,7 +133,7 @@ static int request_frame(AVFilterLink *link) nb_samples); if (!buf) return AVERROR(ENOMEM); - ret = avresample_convert(s->avr, (void**)buf->extended_data, + ret = avresample_convert(s->avr, buf->extended_data, buf->linesize[0], nb_samples, NULL, 0, 0); if (ret <= 0) { avfilter_unref_bufferp(&buf); @@ -149,7 +149,7 @@ static int request_frame(AVFilterLink *link) static int write_to_fifo(ASyncContext *s, AVFilterBufferRef *buf) { - int ret = avresample_convert(s->avr, NULL, 0, 0, (void**)buf->extended_data, + int ret = avresample_convert(s->avr, NULL, 0, 0, buf->extended_data, buf->linesize[0], buf->audio->nb_samples); avfilter_unref_buffer(buf); return ret; @@ -210,7 +210,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) goto fail; } - avresample_read(s->avr, (void**)buf_out->extended_data, out_size); + avresample_read(s->avr, buf_out->extended_data, out_size); buf_out->pts = s->pts; if (delta > 0) { @@ -230,7 +230,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) avresample_read(s->avr, NULL, avresample_available(s->avr)); s->pts = pts - avresample_get_delay(s->avr); - ret = avresample_convert(s->avr, NULL, 0, 0, (void**)buf->extended_data, + ret = avresample_convert(s->avr, NULL, 0, 0, buf->extended_data, buf->linesize[0], buf->audio->nb_samples); fail: diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index eb2d2f9e21..c51f9d243b 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -149,7 +149,7 @@ static int request_frame(AVFilterLink *outlink) if (!buf) return AVERROR(ENOMEM); - ret = avresample_convert(s->avr, (void**)buf->extended_data, + ret = avresample_convert(s->avr, buf->extended_data, buf->linesize[0], nb_samples, NULL, 0, 0); if (ret <= 0) { @@ -186,9 +186,9 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf) goto fail; } - ret = avresample_convert(s->avr, (void**)buf_out->extended_data, + ret = avresample_convert(s->avr, buf_out->extended_data, buf_out->linesize[0], nb_samples, - (void**)buf->extended_data, buf->linesize[0], + buf->extended_data, buf->linesize[0], buf->audio->nb_samples); if (ret < 0) { avfilter_unref_buffer(buf_out); |