diff options
| author | wm4 <wm4@nowhere> | 2013-04-06 22:43:12 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-12 21:24:55 +0200 |
| commit | 4b5cee4617d0decbf93d06df4f45097fd7e00105 (patch) | |
| tree | b6d293e86d83ab5c3efd99153aa7a7a134d2937f /audio/decode/ad_mpg123.c | |
| parent | 586b75ad0840e154835ae67c7720b71bd36f8cc9 (diff) | |
| download | mpv-4b5cee4617d0decbf93d06df4f45097fd7e00105.tar.bz2 mpv-4b5cee4617d0decbf93d06df4f45097fd7e00105.tar.xz | |
core: use channel map on demuxer level too
This helps passing the channel layout correctly from decoder to audio
filter chain. (Because that part "reuses" the demuxer level codec
parameters, which is very disgusting.)
Note that ffmpeg stuff already passed the channel layout via
mp_copy_lav_codec_headers(). So other than easier dealing with the
demuxer/decoder parameters mess, there's no real advantage to doing
this.
Make the --channels option accept a channel map. Since simple numbers
map to standard layouts with the given number of channels, this is
downwards compatible. Likewise for demux_rawaudio.
Diffstat (limited to 'audio/decode/ad_mpg123.c')
| -rw-r--r-- | audio/decode/ad_mpg123.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c index 999dc2fbba..45538f42f6 100644 --- a/audio/decode/ad_mpg123.c +++ b/audio/decode/ad_mpg123.c @@ -358,7 +358,7 @@ static int init(sh_audio_t *sh, const char *decoder) con->mean_count = 0; #endif con->vbr = (finfo.vbr != MPG123_CBR); - sh->channels = channels; + mp_chmap_from_channels(&sh->channels, channels); sh->samplerate = rate; /* Without external force, mpg123 will always choose signed encoding, * and non-16-bit only on builds that don't support it. |