From f7f0242a8a5b272c8944f891265d5d818e806fee Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 1 Feb 2011 12:09:42 +0100
Subject: [PATCH] update ffmpeg to fix h264 crash update linphone

---
 .../externals/build/ffmpeg/Android_libavcodec.mk  |  2 +-
 .../externals/build/ffmpeg/Android_libavcore.mk   |  5 ++++-
 submodules/externals/build/ffmpeg/config.h        | 15 +++++++++++++++
 submodules/externals/ffmpeg                       |  2 +-
 submodules/linphone                               |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
index 43771da28..3a70e4b85 100755
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
@@ -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
diff --git a/submodules/externals/build/ffmpeg/Android_libavcore.mk b/submodules/externals/build/ffmpeg/Android_libavcore.mk
index 82a180f77..70618d217 100644
--- a/submodules/externals/build/ffmpeg/Android_libavcore.mk
+++ b/submodules/externals/build/ffmpeg/Android_libavcore.mk
@@ -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
diff --git a/submodules/externals/build/ffmpeg/config.h b/submodules/externals/build/ffmpeg/config.h
index 0ea96b84c..7a9591f6a 100644
--- a/submodules/externals/build/ffmpeg/config.h
+++ b/submodules/externals/build/ffmpeg/config.h
@@ -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 */
+
diff --git a/submodules/externals/ffmpeg b/submodules/externals/ffmpeg
index 76393d0b7..492347d3b 160000
--- a/submodules/externals/ffmpeg
+++ b/submodules/externals/ffmpeg
@@ -1 +1 @@
-Subproject commit 76393d0b78fd47857fd7bd27756945c1bb021efd
+Subproject commit 492347d3bbf6cdae54dd8b68fb447e7496aed04f
diff --git a/submodules/linphone b/submodules/linphone
index 2cbfc4710..cb7e67278 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2cbfc471081fdd61ec8f5af3a15c42dfa3911471
+Subproject commit cb7e67278afd85efab4dbb15650d2e9f609bedd4