[vlc-commits] demux: mp4: fix g711 regression (missing channels count)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Feb  8 13:55:49 2019 +0100| [4f258411c8e0d54a2028a5c49e240c76c3abdccd] | committer: Francois Cartegnie

demux: mp4: fix g711 regression (missing channels count)

introduced with 3d24a401e710186220dac597074dfc2ae81ec334

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4f258411c8e0d54a2028a5c49e240c76c3abdccd
---

 modules/demux/mp4/essetup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index cf48c79c23..c8db83fc11 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -1214,7 +1214,7 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
              * as vlc can't enumerate channels for compressed content */
             if( i_bps || p_track->rgi_chans_reordering == NULL )
             {
-                p_track->fmt.audio.i_channels = i_channels;
+                p_track->fmt.audio.i_channels = vlc_popcount(i_vlc_mapping);
                 p_track->fmt.audio.i_physical_channels = i_vlc_mapping;
             }
         }