diff options
| author | Rodeo <[email protected]> | 2012-06-20 15:31:48 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-06-20 15:31:48 +0000 |
| commit | d2189f51f3d68ac81e4849bda4a96877981baeab (patch) | |
| tree | d5c0df5672d97552563f244d94cdf2888e4729f4 | |
| parent | 9e3a42cb43f64368c1d804fd5d9a6f61c2305a42 (diff) | |
common.h, common.c: minor modifications.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4758 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/common.c | 6 | ||||
| -rw-r--r-- | libhb/common.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libhb/common.c b/libhb/common.c index aba940619..6ec4ee308 100644 --- 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 059defc68..c55f49ad7 100644 --- 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); |