diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index b8e14dfbf3..907b154bf8 100644 --- a/audio/decode/dec_audio.c +++ b/audio/decode/dec_audio.c @@ -209,8 +209,6 @@ int audio_init_filters(struct dec_audio *d_audio, int in_samplerate, mp_audio_set_channels(&afs->output, out_channels); mp_audio_set_format(&afs->output, *out_format); - afs->metadata = d_audio->metadata; - afs->replaygain_data = d_audio->replaygain_data; char *s_from = mp_audio_config_to_str(&afs->input); diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h index 27c2040947..25afda1390 100644 --- a/audio/decode/dec_audio.h +++ b/audio/decode/dec_audio.h @@ -36,7 +36,6 @@ struct dec_audio { struct mp_audio_buffer *decode_buffer; struct af_stream *afilter; char *decoder_desc; - struct mp_tags *metadata; struct replaygain_data *replaygain_data; // set by decoder struct mp_audio decoded; // format of decoded audio (no data, temporarily diff --git a/audio/filter/af.c b/audio/filter/af.c index fe2dcdfb13..9227c9c036 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -204,7 +204,6 @@ static struct af_instance *af_create(struct af_stream *s, char *name, .mul = 1, .data = talloc_zero(af, struct mp_audio), .log = mp_log_new(af, s->log, name), - .metadata = s->metadata, .replaygain_data = s->replaygain_data, }; struct m_config *config = m_config_from_obj_desc(af, s->log, &desc); diff --git a/audio/filter/af.h b/audio/filter/af.h index aa49963b28..bec0e823fe 100644 --- a/audio/filter/af.h +++ b/audio/filter/af.h @@ -59,7 +59,6 @@ struct af_info { struct af_instance { const struct af_info *info; struct mp_log *log; - struct mp_tags *metadata; struct replaygain_data *replaygain_data; int (*control)(struct af_instance *af, int cmd, void *arg); void (*uninit)(struct af_instance *af); @@ -92,7 +91,6 @@ struct af_stream { struct mp_log *log; struct MPOpts *opts; - struct mp_tags *metadata; struct replaygain_data *replaygain_data; }; diff --git a/player/audio.c b/player/audio.c index d893206764..26d9f196a3 100644 --- a/player/audio.c +++ b/player/audio.c @@ -119,7 +119,6 @@ void reinit_audio_chain(struct MPContext *mpctx) mpctx->d_audio->global = mpctx->global; mpctx->d_audio->opts = opts; mpctx->d_audio->header = sh; - mpctx->d_audio->metadata = mpctx->demuxer->metadata; mpctx->d_audio->replaygain_data = sh->audio->replaygain_data; if (!audio_init_best_codec(mpctx->d_audio, opts->audio_decoders)) goto init_error;