generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2498 from mstorsjo/android-avoid-stl-include

Browse Source 
Use assert.h instead of cassert
This commit is contained in:
HaiboZhu 2016-06-16 09:21:03 +08:00 committed by GitHub
commit 5637df510e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/platform-android.mk
View File

@ -62,7 +62,6 @@ CODEC_UNITTEST_INCLUDES = $(STL_INCLUDES)
CODEC_UNITTEST_LDFLAGS_SUFFIX = $(STL_LIB)
MODULE_INCLUDES = $(STL_INCLUDES)
MODULE_LDFLAGS = $(STL_LIB)
CXXFLAGS += $(STL_INCLUDES)
ifeq (./,$(SRC_PATH))
binaries: decdemo encdemo

2
codec/processing/src/downsample/downsample.cpp
View File

@ -32,7 +32,7 @@
#include "downsample.h"
#include "cpu.h"
#include <cassert>
#include <assert.h>
WELSVP_NAMESPACE_BEGIN
#define MAX_SAMPLE_WIDTH 1920