commit 6865af63786ab9a41773cb9efc2c763f4fff7329
author Jim Bankoski <jimbankoski@google.com> Mon Jul 28 09:47:57 2014 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Mon Jul 28 09:47:57 2014 -0700
tree 897606460658806744a1c099e9675c126ff76cef
parent 9bbcc20b572face3b2cf753d702514d57765015f
parent 899585ebe9a1e8e3ba408ac0b1652e14d8d6eaaf

Merge "Fix reference frame size restrictions."

test/frame_size_tests.cc

diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index d1ea096..34ee8b6 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -62,16 +62,6 @@
   video.set_limit(2);
   expected_res_ = VPX_CODEC_CORRUPT_FRAME;
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
-#else
-  // If we are on a 32 bit platform we can't possibly allocate enough memory
-  // for the largest video frame size (64kx64k). This test checks that we
-  // properly return a memory error.
-  if (sizeof(size_t) == 4) {
-    video.SetSize(65535, 65535);
-    video.set_limit(2);
-    expected_res_ = VPX_CODEC_MEM_ERROR;
-    ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
-  }
 #endif
 }