summaryrefslogtreecommitdiffstats
path: root/audio/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-01-19 21:33:05 +0100
committerwm4 <wm4@nowhere>2016-01-19 21:33:05 +0100
commitc365b44e19e1ab1cdb0d2aaca5360108d6da862a (patch)
treead2b09268e40e778ea805ce06b6ccf4c21a786bf /audio/decode
parent7737499a7459e32cd95e20be9af319be8cba98df (diff)
downloadmpv-c365b44e19e1ab1cdb0d2aaca5360108d6da862a.tar.bz2
mpv-c365b44e19e1ab1cdb0d2aaca5360108d6da862a.tar.xz
audio: move dec_audio.pool to ad_spdif
That's where its only use is.
Diffstat (limited to 'audio/decode')
-rw-r--r--audio/decode/ad_spdif.c4
-rw-r--r--audio/decode/dec_audio.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index 5e9dcf1c4f..dd0ef181af 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -41,6 +41,7 @@ struct spdifContext {
bool need_close;
bool use_dts_hd;
struct mp_audio fmt;
+ struct mp_audio_pool *pool;
};
static int write_packet(void *p, uint8_t *buf, int buf_size)
@@ -79,6 +80,7 @@ static int init(struct dec_audio *da, const char *decoder)
da->priv = spdif_ctx;
spdif_ctx->log = da->log;
spdif_ctx->use_dts_hd = da->opts->dtshd;
+ spdif_ctx->pool = mp_audio_pool_create(spdif_ctx);
if (strcmp(decoder, "dts-hd") == 0) {
decoder = "dts";
@@ -269,7 +271,7 @@ static int decode_packet(struct dec_audio *da, struct mp_audio **out)
return AD_ERR;
int samples = spdif_ctx->out_buffer_len / spdif_ctx->fmt.sstride;
- *out = mp_audio_pool_get(da->pool, &spdif_ctx->fmt, samples);
+ *out = mp_audio_pool_get(spdif_ctx->pool, &spdif_ctx->fmt, samples);
if (!*out)
return AD_ERR;
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h
index a8c66fa67e..17ce6b838f 100644
--- a/audio/decode/dec_audio.h
+++ b/audio/decode/dec_audio.h
@@ -36,7 +36,6 @@ struct dec_audio {
struct af_stream *afilter;
char *decoder_desc;
int init_retries;
- struct mp_audio_pool *pool;
struct mp_audio decode_format;
struct mp_audio *waiting; // used on format-change
// set by decoder