mozilla-inbound: changeset 120543:703cfc2901995b2bb4eafc637e6ef664dcac48c6

author	L. David Baron <dbaron@dbaron.org>
	Thu, 31 Jan 2013 22:24:53 -0800
changeset 120543	703cfc2901995b2bb4eafc637e6ef664dcac48c6
parent 120542	4444d9e3af9a24af8f4081eacc3148756c76a802
child 120544	a62ffd085b9dc6fdd70eb4281b546db686f9e3ec
push id	22288
push user	dbaron@mozilla.com
push date	Fri, 01 Feb 2013 06:25:10 +0000
treeherder	mozilla-inbound@703cfc290199 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	830707
milestone	21.0a1
first release with	nightly linux32 4e7c92906a79 / 21.0a1 / 20130202030955 / files nightly linux64 4e7c92906a79 / 21.0a1 / 20130202030955 / files nightly mac 4e7c92906a79 / 21.0a1 / 20130202030955 / files nightly win32 4e7c92906a79 / 21.0a1 / 20130202030955 / files nightly win64 4e7c92906a79 / 21.0a1 / 20130202030955 / files
last release without	nightly linux32 20bbf73921f4 / 21.0a1 / 20130131031009 / files nightly linux64 20bbf73921f4 / 21.0a1 / 20130131031009 / files nightly mac 20bbf73921f4 / 21.0a1 / 20130131031009 / files nightly win32 20bbf73921f4 / 21.0a1 / 20130131031009 / files nightly win64 20bbf73921f4 / 21.0a1 / 20130131031009 / files

--- a/content/media/AudioChannelFormat.cpp
+++ b/content/media/AudioChannelFormat.cpp
@@ -13,17 +13,17 @@ enum {
   SURROUND_L,
   SURROUND_R,
   SURROUND_C,
   SURROUND_LFE,
   SURROUND_SL,
   SURROUND_SR
 };
 
-static const int CUSTOM_CHANNEL_LAYOUTS = 6;
+static const uint32_t CUSTOM_CHANNEL_LAYOUTS = 6;
 
 uint32_t
 GetAudioChannelsSuperset(uint32_t aChannels1, uint32_t aChannels2)
 {
   if (aChannels1 == 3 && aChannels2 == 4) {
     // quad layout has no center channel, but input has a center channel as well
     // as L and R, so we actually need a 5-channel layout here.
     return 5;