diff options
| -rw-r--r-- | audio/filter/af_volume.c | 16 | ||||
| -rw-r--r-- | demux/demux.c | 7 |
2 files changed, 11 insertions, 12 deletions
diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c index 20031961b4..e1d5d45e89 100644 --- a/audio/filter/af_volume.c +++ b/audio/filter/af_volume.c @@ -71,15 +71,19 @@ static int control(struct af_instance *af, int cmd, void *arg) if (af_fmt_is_planar(in->format)) mp_audio_set_format(af->data, af_fmt_to_planar(af->data->format)); s->rgain = 1.0; - if ((s->rgain_track || s->rgain_album) && af->replaygain_data) { - float gain, peak; + struct replaygain_data *rg = af->replaygain_data; + if ((s->rgain_track || s->rgain_album) && rg) { + MP_VERBOSE(af, "Replaygain: Track=%f/%f Album=%f/%f\n", + rg->track_gain, rg->track_peak, + rg->album_gain, rg->album_peak); + float gain, peak; if (s->rgain_track) { - gain = af->replaygain_data->track_gain; - peak = af->replaygain_data->track_peak; + gain = rg->track_gain; + peak = rg->track_peak; } else { - gain = af->replaygain_data->album_gain; - peak = af->replaygain_data->album_peak; + gain = rg->album_gain; + peak = rg->album_peak; } gain += s->rgain_preamp; diff --git a/demux/demux.c b/demux/demux.c index 599218b690..e7fcb88e10 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -1002,13 +1002,8 @@ static void demux_update_replaygain(demuxer_t *demuxer) struct replaygain_data *rg = decode_rgain(demuxer->log, sh->tags); if (!rg) rg = decode_rgain(demuxer->log, demuxer->metadata); - if (rg) { - MP_VERBOSE(demuxer, "Replaygain/%d: Track=%f/%f Album=%f/%f\n", - sh->index, - rg->track_gain, rg->track_peak, - rg->album_gain, rg->album_peak); + if (rg) sh->codec->replaygain_data = talloc_steal(in, rg); - } } } } |