summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BUILD8
-rw-r--r--libhb/common.c6
-rw-r--r--macosx/English.lproj/MainMenu.nib/info.nib13
-rw-r--r--macosx/English.lproj/MainMenu.nib/keyedobjects.nibbin56340 -> 56345 bytes
-rw-r--r--test/test.c2
5 files changed, 10 insertions, 19 deletions
diff --git a/BUILD b/BUILD
index 413644061..9031c1400 100644
--- a/BUILD
+++ b/BUILD
@@ -19,11 +19,11 @@ Step 1: get needed tools
On BeOS, you can download it at <http://www.haiku-os.org/develop.php>.
On OS X, you cannot use the modified jam shipped with the developer
tools, use this one instead:
- <http://handbrake.m0k.org/files/jam-2.5rc3-OSX.zip>.
-+ nasm (except for OS X)
+ <http://download.m0k.org/handbrake/jam-2.5rc3-OSX.zip>.
++ nasm (Only for x86. On Mac OS X Intel, Nasm CVS is required)
Step 2: build
=============
-Run `jam'. This will build every library HandBrake requires, then
-HandBrake itself.
+Run `./configure && jam'. This will build every library HandBrake
+requires, then HandBrake itself.
diff --git a/libhb/common.c b/libhb/common.c
index c9650ab4b..105fa44f5 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -21,11 +21,11 @@ int hb_video_rates_count = sizeof( hb_video_rates ) /
sizeof( hb_rate_t );
hb_rate_t hb_audio_rates[] =
-{ { "22050", 22050 }, { "24000", 24000 },
- { "44100", 44100 }, { "48000", 48000 } };
+{ { "22.05", 22050 }, { "24", 24000 }, { "32", 32000 },
+ { "44.1", 44100 }, { "48", 48000 } };
int hb_audio_rates_count = sizeof( hb_audio_rates ) /
sizeof( hb_rate_t );
-int hb_audio_rates_default = 2; /* 44100 Hz */
+int hb_audio_rates_default = 3; /* 44100 Hz */
hb_rate_t hb_audio_bitrates[] =
{ { "32", 32 }, { "40", 40 }, { "48", 48 }, { "56", 56 },
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 0854e6d3d..36f69f000 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -10,17 +10,8 @@
<string>157 764 261 44 0 0 1280 832 </string>
</dict>
<key>IBFramework Version</key>
- <string>439.0</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>365</integer>
- <integer>1438</integer>
- <integer>21</integer>
- <integer>29</integer>
- <integer>1162</integer>
- <integer>1348</integer>
- </array>
+ <string>443.0</string>
<key>IBSystem Version</key>
- <string>8F46</string>
+ <string>8I127</string>
</dict>
</plist>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 9d8af0121..be6d9b1c3 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
Binary files differ
diff --git a/test/test.c b/test/test.c
index 4fd8e57df..e01bec7a1 100644
--- a/test/test.c
+++ b/test/test.c
@@ -527,7 +527,7 @@ static void ShowHelp()
if( i != hb_audio_rates_count - 1 )
fprintf( stderr, "/" );
}
- fprintf( stderr, ")\n"
+ fprintf( stderr, " kHz)\n"
" -b, --vb <kb/s> Set video bitrate (default: 1000)\n"
" -q, --quality <float> Set video quality (0.0..1.0)\n"
" -S, --size <MB> Set target size\n"