ref: 5637df510ed8b3a870fa361ac9cbd2d64e874a1c
parent: 8661e358c0680f94844a19282e85ab89b78e8372
parent: e945654f062714455b22470319786a35a5a82d7e
author: HaiboZhu <haibozhu@cisco.com>
date: Thu Jun 16 05:21:03 EDT 2016
Merge pull request #2498 from mstorsjo/android-avoid-stl-include Use assert.h instead of cassert
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -62,7 +62,6 @@
CODEC_UNITTEST_LDFLAGS_SUFFIX = $(STL_LIB)
MODULE_INCLUDES = $(STL_INCLUDES)
MODULE_LDFLAGS = $(STL_LIB)
-CXXFLAGS += $(STL_INCLUDES)
ifeq (./,$(SRC_PATH))
binaries: decdemo encdemo
--- a/codec/processing/src/downsample/downsample.cpp
+++ b/codec/processing/src/downsample/downsample.cpp
@@ -32,7 +32,7 @@
#include "downsample.h"
#include "cpu.h"
-#include <cassert>
+#include <assert.h>
WELSVP_NAMESPACE_BEGIN
#define MAX_SAMPLE_WIDTH 1920