Fix two uninitialized variables in media

media/filters/stream_parser_factory.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/stream_parser_factory.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 87 matching lines @@
   return new WebMStreamParser();
 }
 
 #if defined(USE_PROPRIETARY_CODECS)
 // AAC Object Type IDs that Chrome supports.
 static const int kAACLCObjectType = 2;
 static const int kAACSBRObjectType = 5;
 
 static int GetMP4AudioObjectType(const std::string& codec_id,
                                  const LogCB& log_cb) {
-  int audio_object_type;
   std::vector<std::string> tokens;
-  if (Tokenize(codec_id, ".", &tokens) != 3 ||
-      tokens[0] != "mp4a" || tokens[1] != "40" ||
-      !base::HexStringToInt(tokens[2], &audio_object_type)) {
-    MEDIA_LOG(log_cb) << "Malformed mimetype codec '" << codec_id << "'";
-    return -1;
+  if (Tokenize(codec_id, ".", &tokens) == 3 &&
+      tokens[0] != "mp4a" || tokens[1] == "40") {

[DaleCurtis, 2014/07/26 01:06:38]

== mp4a?

[Will Harris, 2014/07/26 01:15:54]

Done.

+    int audio_object_type;

[Peter Kasting, 2014/07/26 01:01:36]

This works too, but I was suggesting leaving this declaration where you had it
before, so this could stay as one if.  I don't know for sure that MSVC will like
that but it often does.

[Will Harris, 2014/07/26 01:15:53]

Wow MSVC is crazy - it didn't like it when I made it all one if statement, but
was okay when I split the if statement into two parts.

+    if (base::HexStringToInt(tokens[2], &audio_object_type)) {

[Peter Kasting, 2014/07/26 01:01:36]

Nit: No {}

[Will Harris, 2014/07/26 01:15:54]

Done.

+      return audio_object_type;
+    }
   }
 
-
-  return audio_object_type;
+  MEDIA_LOG(log_cb) << "Malformed mimetype codec '" << codec_id << "'";
+  return -1;
 }
 
 bool ValidateMP4ACodecID(const std::string& codec_id, const LogCB& log_cb) {
   int audio_object_type = GetMP4AudioObjectType(codec_id, log_cb);
   if (audio_object_type == kAACLCObjectType ||
       audio_object_type == kAACSBRObjectType) {
     return true;
   }
 
   MEDIA_LOG(log_cb) << "Unsupported audio object type "
@@ skipping 277 matching lines @@
                                 CodecInfo::HISTOGRAM_MAX + 1);
     }
 
     stream_parser.reset(factory_function(codecs, log_cb));
   }
 
   return stream_parser.Pass();
 }
 
 }  // namespace media