From ba42fed9e5c2973f4034660fd9b1fccaf36e2a0f Mon Sep 17 00:00:00 2001
From: Kongqun Yang <kqyang@google.com>
Date: Fri, 22 Apr 2016 09:46:18 -0700
Subject: [PATCH] Suppress warning messages when determining containers

- These warning messages are not useful since the code needs to
  loop through various container types to find a matching one.

Change-Id: I1d8eca563faf24e485ac71cce32e09515c174bf2
---
 packager/media/base/container_names.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packager/media/base/container_names.cc b/packager/media/base/container_names.cc
index d49ed30a5d..8fd38c5d5c 100644
--- a/packager/media/base/container_names.cc
+++ b/packager/media/base/container_names.cc
@@ -14,7 +14,6 @@
 #include "packager/base/logging.h"
 #include "packager/base/strings/string_util.h"
 #include "packager/media/base/bit_reader.h"
-#include "packager/media/base/rcheck.h"
 #include "packager/mpd/base/xml/scoped_xml_ptr.h"
 
 namespace edash_packager {
@@ -25,6 +24,12 @@ namespace media {
    (static_cast<uint8_t>(b) << 16) | (static_cast<uint8_t>(c) << 8) | \
    (static_cast<uint8_t>(d)))
 
+#define RCHECK(x)   \
+  do {              \
+    if (!(x))       \
+      return false; \
+  } while (0)
+
 #define UTF8_BYTE_ORDER_MARK "\xef\xbb\xbf"
 
 // Helper function to read 2 bytes (16 bits, big endian) from a buffer.