summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-16 19:43:58 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-17 10:16:07 +0100
commit645c61fb2b9e434768a59f3c52f093d726061d95 (patch)
tree20e6442056ba28ef1c28df578373db302a1f8150 /ffplay.c
parentc4deb90cfaf7ef64bb80216ca1aa95db95a6f521 (diff)
swr: rename swr_alloc2() to swr_alloc_set_opts().
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index 5cc4fa4258..8022be504c 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2076,9 +2076,10 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
if (dec->sample_fmt != is->audio_src_fmt || dec_channel_layout != is->audio_src_channel_layout || dec->sample_rate != is->audio_src_freq) {
if (is->swr_ctx)
swr_free(&is->swr_ctx);
- is->swr_ctx = swr_alloc2(NULL, is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
- dec_channel_layout, dec->sample_fmt, dec->sample_rate,
- NULL, 0, NULL);
+ is->swr_ctx = swr_alloc_set_opts(NULL,
+ is->audio_tgt_channel_layout, is->audio_tgt_fmt, is->audio_tgt_freq,
+ dec_channel_layout, dec->sample_fmt, dec->sample_rate,
+ NULL, 0, NULL);
if (!is->swr_ctx || swr_init(is->swr_ctx) < 0) {
fprintf(stderr, "Cannot create sample rate converter for conversion of %d Hz %s %d channels to %d Hz %s %d channels!\n",
dec->sample_rate,