diff options
| author | ritsuka <[email protected]> | 2009-05-23 09:46:36 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2009-05-23 09:46:36 +0000 |
| commit | 9cd4b18874948ed58b5724de086338eb3c036b07 (patch) | |
| tree | 4de94af339e96401dc4c77d0741643a0cb0ed82e /libhb/work.c | |
| parent | 8690c484f325fab8335f8a87a10406726994961d (diff) | |
- Add CoreAudio AAC as one of the encoder on Mac OS X.
- Remove hb_init() and hb_init_express() macro. Rename hb_init_real() to hb_init()
- Add two more bitrate combination for audio codecs in common.h
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2441 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/work.c')
| -rw-r--r-- | libhb/work.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libhb/work.c b/libhb/work.c index 59dea5dfe..21232debf 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -106,6 +106,7 @@ hb_work_object_t * hb_codec_encoder( int codec ) case HB_ACODEC_FAAC: return hb_get_work( WORK_ENCFAAC ); case HB_ACODEC_LAME: return hb_get_work( WORK_ENCLAME ); case HB_ACODEC_VORBIS: return hb_get_work( WORK_ENCVORBIS ); + case HB_ACODEC_CA_AAC: return hb_get_work( WORK_ENC_CA_AAC ); } return NULL; } @@ -329,8 +330,9 @@ void hb_display_job_info( hb_job_t * job ) else { hb_log( " + encoder: %s", ( audio->config.out.codec == HB_ACODEC_FAAC ) ? - "faac" : ( ( audio->config.out.codec == HB_ACODEC_LAME ) ? "lame" : - "vorbis" ) ); + "faac" : ( ( audio->config.out.codec == HB_ACODEC_LAME ) ? + "lame" : ( ( audio->config.out.codec == HB_ACODEC_CA_AAC ) ? + "ca_aac" : "vorbis" ) ) ); hb_log( " + bitrate: %d kbps, samplerate: %d Hz", audio->config.out.bitrate, audio->config.out.samplerate ); } } |