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 /gtk | |
| 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 'gtk')
| -rw-r--r-- | gtk/configure.ac | 12 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index 94219c32d..b4965c48f 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -36,21 +36,21 @@ AC_ARG_WITH(hb, if test $hb_PATHSET = 1 ; then case ${with_hb} in /*) - CXXFLAGS="$CXXFLAGS -I$with_hb/libhb" - CFLAGS="$CFLAGS -I$with_hb/libhb" + CXXFLAGS="$CXXFLAGS -I$with_hb/libhb -I$with_hb/contrib/include" + CFLAGS="$CFLAGS -I$with_hb/libhb -I$with_hb/contrib/include" LDFLAGS="$LDFLAGS -L$with_hb/libhb -L$with_hb/contrib/lib" AC_SUBST(HB_DIR, "$with_hb") ;; *) - CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb" - CFLAGS="$CFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb" + CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb "'-I$(top_srcdir)/'"$with_hb/contrib/include" + CFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb "'-I$(top_srcdir)/'"$with_hb/contrib/include" LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"$with_hb/libhb "'-L$(top_srcdir)/'"$with_hb/contrib/lib" AC_SUBST(HB_DIR, '$(top_srcdir)/'"$with_hb") ;; esac else - CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"../libhb" - CFLAGS="$CFLAGS "'-I$(top_srcdir)/'"../libhb" + CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"../libhb "'-I$(top_srcdir)/'"../contrib/include" + CFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"../libhb "'-I$(top_srcdir)/'"../contrib/include" LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"../libhb "'-L$(top_srcdir)/'"../contrib/lib" AC_SUBST(HB_DIR, '$(top_srcdir)/'"..") fi diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 46898b9c8..a4d5ee040 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -1702,8 +1702,7 @@ gint ghb_get_best_mix(hb_audio_config_t *aconfig, gint acodec, gint mix) { gint layout; - layout = aconfig ? aconfig->in.channel_layout : - HB_INPUT_CH_LAYOUT_3F2R | HB_INPUT_CH_LAYOUT_HAS_LFE; + layout = aconfig ? aconfig->in.channel_layout : AV_CH_LAYOUT_5POINT1; return hb_get_best_mixdown( acodec, layout, mix ); } @@ -2438,7 +2437,7 @@ ghb_find_audio_track( if (used[ii]) continue; - channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( + channels = av_get_channel_layout_nb_channels( audio->in.channel_layout); // Find a track that is not visually impaired or dirctor's // commentary, and has the highest channel count. @@ -2482,7 +2481,7 @@ ghb_find_audio_track( if (passthru_used[ii]) continue; } - channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( + channels = av_get_channel_layout_nb_channels( audio->in.channel_layout); // Find a track that is not visually impaired or dirctor's commentary if ((audio->lang.type < 2) && @@ -2519,7 +2518,7 @@ ghb_find_audio_track( if (used[ii]) continue; - channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( + channels = av_get_channel_layout_nb_channels( audio->in.channel_layout); // Find a track that is not visually impaired or dirctor's // commentary, and has the highest channel count. @@ -2554,7 +2553,7 @@ ghb_find_audio_track( audio = (hb_audio_config_t*)hb_list_audio_config_item( title->list_audio, ii ); passthru_acodec = HB_ACODEC_PASS_MASK & audio->in.codec; - channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( + channels = av_get_channel_layout_nb_channels( audio->in.channel_layout); if (passthru_acodec && passthru) { |