Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
a2d3a117
Commit
a2d3a117
authored
May 16, 2018
by
François Grisez
Browse files
Fix build
parent
1b01e853
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/CMakeLists.txt
src/CMakeLists.txt
+1
-1
src/android/mediacodech264enc.cpp
src/android/mediacodech264enc.cpp
+2
-2
No files found.
src/CMakeLists.txt
View file @
a2d3a117
...
...
@@ -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
...
...
src/android/mediacodech264enc.cpp
View file @
a2d3a117
...
...
@@ -79,7 +79,7 @@ static void set_mblk(mblk_t **packet, mblk_t *newone) {
*
packet
=
newone
;
}
static
in
t
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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment