Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update ffmpeg to fix h264 crash

Browse source 
update linphone
This commit is contained in:
Simon Morlat 2011-02-01 12:09:42 +01:00
parent d4d50e0ba4
commit f7f0242a8a
5 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
submodules/externals/build/ffmpeg/Android_libavcodec.mk vendored
View file

@ -84,7 +84,7 @@ LOCAL_SRC_FILES = \
libavcodec/resample2.c \
libavcodec/simple_idct.c \
libavcodec/utils.c \
libavcodec/pthread.c
libavcodec/pthread.c
LOCAL_ARM_MODE := arm

5
submodules/externals/build/ffmpeg/Android_libavcore.mk vendored
View file

@ -8,7 +8,10 @@ LOCAL_MODULE := libavcore
LOCAL_SRC_FILES := \
libavcore/imgutils.c \
libavcore/parseutils.c \
libavcore/utils.c
libavcore/utils.c
# libavcore/samplefmt.c \
# libavcore/audioconvert.c
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H

15
submodules/externals/build/ffmpeg/config.h vendored
View file

@ -938,4 +938,19 @@
#define CONFIG_LIBDC1394_INDEV 0
#define CONFIG_ALSA_OUTDEV 0
#define CONFIG_OSS_OUTDEV 0
/*added by hand after ffmpeg update */
#define CONFIG_LAGARITH_DECODER 0
#define CONFIG_AAC_LATM_DECODER 0
#define CONFIG_AC3_FIXED_ENCODER 0
#define CONFIG_AMRWB_DECODER 0
#define CONFIG_PCM_LXF_DECODER 0
#define CONFIG_ASS_ENCODER 0
#define CONFIG_ASS_DECODER 0
#define CONFIG_SRT_DECODER 0
#define CONFIG_AAC_LATM_PARSER 0
#define CONFIG_FLAC_PARSER 0
#define CONFIG_MJPEG2JPEG_BSF 0
#endif /* FFMPEG_CONFIG_H */

2
submodules/externals/ffmpeg vendored

@ -1 +1 @@
Subproject commit 76393d0b78fd47857fd7bd27756945c1bb021efd
Subproject commit 492347d3bbf6cdae54dd8b68fb447e7496aed04f

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2cbfc471081fdd61ec8f5af3a15c42dfa3911471
Subproject commit cb7e67278afd85efab4dbb15650d2e9f609bedd4