common.h, common.c: minor modifications.

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

diff --git a/libhb/common.c b/libhb/common.c
index aba9406192f9d6fe682b94ed00b5da63b2e827d7..6ec4ee308744bd6168f701a9bca9277a0463b0c8 100644 (file)
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -710,7 +710,7 @@ float hb_get_default_audio_compression( uint32_t codec )
     return compression;
 }
 
-int hb_get_best_mixdown(uint32_t codec, int layout, int mixdown)
+int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown)
 {
     int best_mixdown;
 
@@ -765,7 +765,7 @@ int hb_get_best_mixdown(uint32_t codec, int layout, int mixdown)
     return best_mixdown;
 }
 
-int hb_get_default_mixdown( uint32_t codec, int layout )
+int hb_get_default_mixdown(uint32_t codec, uint64_t layout)
 {
     int mixdown;
     switch (codec)
@@ -781,7 +781,7 @@ int hb_get_default_mixdown( uint32_t codec, int layout )
             break;
     }
     // return the best available mixdown up to the selected default
-    return hb_get_best_mixdown( codec, layout, mixdown );
+    return hb_get_best_mixdown(codec, layout, mixdown);
 }
 
 /**********************************************************************

diff --git a/libhb/common.h b/libhb/common.h
index 059defc68be1b96bf68d3bd947b45bba9819830d..c55f49ad727f13096dba0f4f04891c6007af38f3 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -204,8 +204,8 @@ const char * hb_mixdown_get_short_name_from_mixdown( int amixdown );
 void hb_autopassthru_apply_settings( hb_job_t * job, hb_title_t * title );
 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_best_mixdown( uint32_t codec, int layout, int mixdown );
-int hb_get_default_mixdown( uint32_t codec, int layout );
+int hb_get_best_mixdown(uint32_t codec, uint64_t layout, int mixdown);
+int hb_get_default_mixdown(uint32_t codec, uint64_t layout);
 int hb_find_closest_audio_bitrate(int bitrate);
 void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown, int *low, int *high);
 int hb_get_best_audio_bitrate( uint32_t codec, int bitrate, int samplerate, int mixdown);