Commit a2d3a117 authored by François Grisez's avatar François Grisez
Browse files

Fix build

parent 1b01e853
......@@ -368,7 +368,6 @@ if(ENABLE_VIDEO)
endif()
if(ANDROID)
list(APPEND VOIP_SOURCE_FILES_C
android/mediacodech264enc.c
android/android-display.c
android/android-opengl-display.c
utils/opengl_functions.c
......@@ -381,6 +380,7 @@ if(ENABLE_VIDEO)
)
list(APPEND VOIP_SOURCE_FILES_CXX
android/mediacodech264dec.cpp
android/mediacodech264enc.cpp
)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
list(APPEND VOIP_SOURCE_FILES_ASM
......
......@@ -79,7 +79,7 @@ static void set_mblk(mblk_t **packet, mblk_t *newone) {
*packet = newone;
}
static int alloc_encoder(EncData *d){
static media_status_t alloc_encoder(EncData *d){
if (!d->codec){
d->codec = AMediaCodec_createEncoderByType("video/avc");
if (!d->codec) {
......@@ -87,7 +87,7 @@ static int alloc_encoder(EncData *d){
return AMEDIA_ERROR_UNKNOWN;
}
}
return 0;
return AMEDIA_OK;
}
static void enc_init(MSFilter *f) {
......
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