From a43d75d8a36099f14638eaf14606535fe559df7b Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 14 Mar 2012 16:25:53 +0100 Subject: [PATCH] Add display_filter_auto_rotate paramter to linphonerc Conflicts: mediastreamer2 --- coreapi/linphonecall.c | 1 + mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index bb68bf03e..82d4e5098 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -899,6 +899,7 @@ void linphone_call_init_media_streams(LinphoneCall *call){ if ((lc->video_conf.display || lc->video_conf.capture) && md->streams[1].port>0){ call->videostream=video_stream_new(md->streams[1].port,linphone_core_ipv6_enabled(lc)); + video_stream_enable_display_filter_auto_rotate(call->videostream, lp_config_get_int(lc->config,"video","display_filter_auto_rotate",0)); if( lc->video_conf.displaytype != NULL) video_stream_set_display_filter_name(call->videostream,lc->video_conf.displaytype); video_stream_set_event_callback(call->videostream,video_stream_event_cb, call); diff --git a/mediastreamer2 b/mediastreamer2 index 0481d7d11..d1e350535 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 0481d7d11e445bf04b095f4adc6d3b76f9e86ee2 +Subproject commit d1e3505352c469f91333f65e43cda48560b26a91