Commit 629ce646 authored by Sandrine Avakian's avatar Sandrine Avakian

Merge branch '2.13.x' of git.linphone.org:mediastreamer2

# Conflicts:
#	src/videofilters/videotoolbox.c
#	src/voip/ice.c
parents 30bea426 db39ec04
......@@ -21,14 +21,14 @@
############################################################################
cmake_minimum_required(VERSION 3.0)
project(mediastreamer2 VERSION 2.12.1 LANGUAGES C CXX)
project(mediastreamer2 VERSION 2.13.0 LANGUAGES C CXX)
set(MEDIASTREAMER_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
set(MEDIASTREAMER_MINOR_VERSION ${PROJECT_VERSION_MINOR})
set(MEDIASTREAMER_MICRO_VERSION ${PROJECT_VERSION_PATCH})
set(MEDIASTREAMER_VERSION ${PROJECT_VERSION})
set(MEDIASTREAMER_SO_VERSION "7") # incremented on January, the 20th 2016. DO NOT INCREMENT BEFORE MEDIASTREAMER 2.13
set(MEDIASTREAMER_SO_VERSION "8") # incremented on June, the 2nd 2016. DO NOT INCREMENT BEFORE MEDIASTREAMER 2.14
string(REGEX MATCH "^(arm*|aarch64)" FIXED_POINT_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
if(FIXED_POINT_PROCESSOR)
......
mediastreamer2-2.13.0: May xx, 2016
mediastreamer2-2.13.0: June 2nd, 2016
* Add support of H264 hardware codec on Apple's platforms
* MSFactory usage : using one MSfactory per LinphoneCore instance,
deprecate all "static" methods, now grouped around the MSFactory object.
......
mediastreamer2 (2.13.0) unstable; urgency=low
* Add support of H264 hardware codec on Apple's platforms
* MSFactory usage : using one MSfactory per LinphoneCore instance,
deprecate all "static" methods, now grouped around the MSFactory object.
* Adding BroadVoice16 audio codec support.
* Fix option to really disable libv4l2 when asked
-- Belledonne Communications <info@belledonne-communications.com> Thu, 2 June 2016 13:50:07 +0200
mediastreamer2 (2.12.1) unstable; urgency=low
* Fix crash in MKV recorder
......
......@@ -3457,7 +3457,7 @@ static void ice_notify_session_processing_finished(IceCheckList *cl, RtpSession
cl->session->event_time = ice_add_ms(ice_current_time(), 1000);
cl->session->event_value = ORTP_EVENT_ICE_SESSION_PROCESSING_FINISHED;
cl->session->send_event = TRUE;
}
}
......@@ -3940,9 +3940,9 @@ void ice_check_list_remove_rtcp_candidates(IceCheckList *cl)
{
bctbx_list_t *elem;
uint16_t rtcp_componentID = ICE_RTCP_COMPONENT_ID;
ice_remove_componentID(&cl->local_componentIDs, rtcp_componentID);
while ((elem = bctbx_list_find_custom(cl->local_candidates, (bctbx_compare_func)ice_find_candidate_with_componentID, &rtcp_componentID)) != NULL) {
IceCandidate *candidate = (IceCandidate *)elem->data;
cl->local_candidates = bctbx_list_remove(cl->local_candidates, candidate);
......
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