From 19b9e0868ef21aa955240096926da30ce7d1235d Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 27 Jan 2014 14:46:23 +0100 Subject: [PATCH] enable h263 96/98 for android --- coreapi/linphonecore.c | 5 +---- mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 522c93f23..968272242 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1281,12 +1281,9 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta #endif #ifdef VIDEO_ENABLED -/* we disable H263 on mobiles because this codec only supports CIF family sizes, and number of cameras don't support it. */ -#if !defined(ANDROID) && !defined(__ios) + linphone_core_assign_payload_type(lc,&payload_type_h263,34,NULL); linphone_core_assign_payload_type(lc,&payload_type_h263_1998,98,"CIF=1;QCIF=1"); -#endif - linphone_core_assign_payload_type(lc,&payload_type_mp4v,99,"profile-level-id=3"); linphone_core_assign_payload_type(lc,&payload_type_h264,102,"profile-level-id=42801F"); linphone_core_assign_payload_type(lc,&payload_type_vp8,103,NULL); diff --git a/mediastreamer2 b/mediastreamer2 index 5d17b2c51..261012c7f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 5d17b2c51483672d33d1e93c172793496ae5fa36 +Subproject commit 261012c7f2d783d133435217d3d92e383f182055