From c365b44e19e1ab1cdb0d2aaca5360108d6da862a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 19 Jan 2016 21:33:05 +0100
Subject: audio: move dec_audio.pool to ad_spdif

That's where its only use is.
---
 audio/decode/ad_spdif.c  | 4 +++-
 audio/decode/dec_audio.h | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'audio/decode')

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
-- 
cgit v1.2.3