Make HB_AMIXDOWN_* defines a simple enumeration. The existing system wasn't necessary and didn't work in all decoders for Dolby downmixing.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4714 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 2 insertions, 4 deletions

diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
index df55db7fd..4c956ad21 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -414,15 +414,13 @@ static int MP4Init( hb_mux_object_t * m )
                 {
                     samplerate = audio->config.in.samplerate;
                     samples_per_frame = audio->config.in.samples_per_frame;
-                    channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
-                                            audio->config.in.channel_layout );
+                    channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( audio->config.in.channel_layout );
                 }
                 else
                 {
                     samplerate = audio->config.out.samplerate;
                     samples_per_frame = audio->config.out.samples_per_frame;
-                    channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(
-                                            audio->config.out.mixdown );
+                    channels = hb_mixdown_get_discrete_channel_count( audio->config.out.mixdown );
                 }
                 mux_data->track = MP4AddAudioTrack( m->file, samplerate, 
                                                 samples_per_frame, audio_type );