Commit 83990608 authored by Simon Morlat's avatar Simon Morlat

do not use LOCAL_ARM_NEON globally.

fix alignment in msrtp.c
parent 9e7e1e64
......@@ -95,7 +95,6 @@ LOCAL_SRC_FILES += \
pixconv.c \
sizeconv.c \
nowebcam.c \
msvideo.c \
h264dec.c \
rfc3984.c \
mire.c \
......@@ -109,13 +108,14 @@ LOCAL_SRC_FILES += \
android-opengl-display.c
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_ARM_NEON := true
LOCAL_CFLAGS += -DVIDEO_ENABLED -DHAVE_NEON=1 -D__ARM_NEON__
LOCAL_SRC_FILES+= \
scaler.c.neon \
scaler_arm.S.neon
scaler_arm.S.neon \
msvideo.c.neon
else
#LOCAL_SRC_FILES+= scaler.c
LOCAL_SRC_FILES+= scaler.c \
msvideo.c
endif
endif
......
......@@ -35,12 +35,12 @@ struct SenderData {
int64_t last_sent_time;
uint32_t skip_until;
int rate;
char dtmf;
bool_t dtmf_start;
int dtmf_duration;
char relay_session_id[64];
int relay_session_id_size;
uint64_t last_rsi_time;
char dtmf;
bool_t dtmf_start;
bool_t skip;
bool_t mute_mic;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment