commit f499433c4377da69f80bcc704ffd23f40dde632a
author wfh@chromium.org <wfh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jul 26 01:33:23 2014
committer wfh@chromium.org <wfh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jul 26 01:33:23 2014
tree adae33601472df85578015cf46a6eaa65a9b550a
parent 8c4907015c336415184aa380e1dfa79335beae67

Fix two uninitialized variables in media.

BUG=397762
TEST=compile with no errors
R=dalecurtis@chromium.org

Review URL: https://codereview.chromium.org/413393006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285741 0039d316-1c4b-4281-b951-d872f2087c98

media/filters/stream_parser_factory.cc

diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index dd0e95a..daeaea2 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -105,17 +105,16 @@
 
 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") {
+    int audio_object_type;
+    if (base::HexStringToInt(tokens[2], &audio_object_type))
+      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) {

media/formats/mp4/box_definitions.cc

diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
index b3060eb..9ee4306 100644
--- a/media/formats/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -761,7 +761,7 @@
     data_offset = 0;
   }
 
-  uint32 first_sample_flags;
+  uint32 first_sample_flags = 0;
   if (first_sample_flags_present)
     RCHECK(reader->Read4(&first_sample_flags));