diff options
author | wm4 <wm4@nowhere> | 2014-07-05 16:45:41 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-07-05 17:07:14 +0200 |
commit | 58880c00eeca254a5391dd61a920081bb16bc2c1 (patch) | |
tree | 56f9bb23059b96c0d7e0eaf58b7ae44f36b0af84 /demux/demux_lavf.c | |
parent | a97256c1d58fae714ae94301ab09044081d08c8e (diff) | |
download | mpv-58880c00eeca254a5391dd61a920081bb16bc2c1.tar.bz2 mpv-58880c00eeca254a5391dd61a920081bb16bc2c1.tar.xz |
demux: make replaygain per-track
It's unlikely that files with multiple audio tracks and with replaygain
actually happen, but this change might help avoid minor corner cases
with later changes.
Diffstat (limited to 'demux/demux_lavf.c')
-rw-r--r-- | demux/demux_lavf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 47e4367fc7..f10c23a753 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -399,7 +399,7 @@ static void select_tracks(struct demuxer *demuxer, int start) } } -static void export_replaygain(demuxer_t *demuxer, AVStream *st) +static void export_replaygain(demuxer_t *demuxer, sh_audio_t *sh, AVStream *st) { #if HAVE_AVCODEC_REPLAYGAIN_SIDE_DATA for (int i = 0; i < st->nb_side_data; i++) { @@ -425,7 +425,7 @@ static void export_replaygain(demuxer_t *demuxer, AVStream *st) rgain->album_peak = (av_rgain->album_peak != 0.0) ? av_rgain->album_peak / 100000.0f : 1.0; - demuxer->replaygain_data = rgain; + sh->replaygain_data = rgain; } #endif } @@ -454,7 +454,7 @@ static void handle_stream(demuxer_t *demuxer, int i) sh_audio->samplerate = codec->sample_rate; sh_audio->bitrate = codec->bit_rate; - export_replaygain(demuxer, st); + export_replaygain(demuxer, sh_audio, st); break; } |