History

Use assert.h instead of cassert

This fixes building for android differently than in f5e483ce. On android, <cassert> isn't available in the normal include path, only when the STL headers are available. We intentionally avoid using STL within the main libopenh264.so, to simplify dependency chains for users of the library (which otherwise could run into conflicts if the surrounding app would want to use a different STL implementation). The previous fix only provided headers, not actually linking against STL, so at this point it's not a real issue yet, but it's still a very slippery slope towards accidentally starting relying on STL within the core library. Instead explicitly avoid using STL within the core library, by not even providing the include path.

Martin Storsjö committed 10 years ago

Commit e9456541 parent 8661e352 files · +1 −2Browse files

Showing the changes to codec/processing/src/downsample/downsample.cpp (1 of 2 files). Show all

Unified · Split

codec/processing/src/downsample/downsample.cpp+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
32 32
33#include "downsample.h"33#include "downsample.h"
34#include "cpu.h"34#include "cpu.h"
35#include <cassert>35#include <assert.h>
36 36
37WELSVP_NAMESPACE_BEGIN37WELSVP_NAMESPACE_BEGIN
38#define MAX_SAMPLE_WIDTH 192038#define MAX_SAMPLE_WIDTH 1920

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t