diff options
| author | Rodeo <[email protected]> | 2012-06-18 21:11:48 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-06-18 21:11:48 +0000 |
| commit | fc3e44b2ba28772fa559d39bd57b7a595a83292f (patch) | |
| tree | 738449c393dcd8da6edf6881e53353b35e5c47b8 /libhb/muxmkv.c | |
| parent | 510564b19b5a6d7ac77091cd02ec9c557941399f (diff) | |
libhb: drop HB_INPUT_CH_LAYOUT_*
AV_CH_LAYOUT_* works for us, and as its usage becomes more widespread in libhb, translating between the two formats gets increasingly tedious.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4754 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxmkv.c')
| -rw-r--r-- | libhb/muxmkv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c index 5761be013..bca946bfb 100644 --- a/libhb/muxmkv.c +++ b/libhb/muxmkv.c @@ -300,13 +300,13 @@ static int MKVInit( hb_mux_object_t * m ) { track->extra.audio.samplingFreq = (float)audio->config.out.samplerate; } - if( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) + if (audio->config.out.codec & HB_ACODEC_PASS_FLAG) { - track->extra.audio.channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( audio->config.in.channel_layout ); + track->extra.audio.channels = av_get_channel_layout_nb_channels(audio->config.in.channel_layout); } else { - track->extra.audio.channels = hb_mixdown_get_discrete_channel_count( audio->config.out.mixdown ); + track->extra.audio.channels = hb_mixdown_get_discrete_channel_count(audio->config.out.mixdown); } mux_data->track = mk_createTrack(m->file, track); if( audio->config.out.codec == HB_ACODEC_VORBIS || |