libhb: add hb_get_default_audio_encoder().

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

diff --git a/libhb/common.c b/libhb/common.c
index af47f9f896a1185b816dd07a6ebcf20c026ad6e7..29435b669bed9235604d532258fb0d138d8bd3d8 100644 (file)
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -431,13 +431,7 @@ int hb_autopassthru_get_encoder( int in_codec, int copy_mask, int fallback, int
         {
             // fallback not possible with current muxer
             // use the default audio encoder instead
-#ifndef __APPLE__
-            if( muxer == HB_MUX_MKV )
-                // Lame is the default for MKV
-                fallback = HB_ACODEC_LAME;
-            else
-#endif          // Core Audio or faac
-                fallback = hb_audio_encoders[0].encoder;
+            fallback = hb_get_default_audio_encoder(muxer);
             break;
         }
     }
@@ -456,6 +450,17 @@ int hb_autopassthru_get_encoder( int in_codec, int copy_mask, int fallback, int
     return out_codec;
 }
 
+int hb_get_default_audio_encoder(int muxer)
+{
+#ifndef __APPLE__
+    if (muxer == HB_MUX_MKV)
+    {
+        return HB_ACODEC_LAME;
+    }
+#endif
+    return hb_audio_encoders[0].encoder;
+}
+
 // Given an input bitrate, find closest match in the set of allowed bitrates
 int hb_find_closest_audio_bitrate(int bitrate)
 {

diff --git a/libhb/common.h b/libhb/common.h
index 9697916c0a7b5a30d5a99b26b8b4a329812b4808..e9b5c29e351d6ed6822f42dc197787bca156aaec 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -245,6 +245,8 @@ void hb_autopassthru_apply_settings(hb_job_t *job);
 void hb_autopassthru_print_settings(hb_job_t *job);
 int  hb_autopassthru_get_encoder(int in_codec, int copy_mask, int fallback, int muxer);
 
+int hb_get_default_audio_encoder(int muxer);
+
 int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown);
 int hb_get_default_mixdown(uint32_t codec, uint64_t layout);