From 0ec1ecfbea3d4f4a1beb34571821f0c1b61215ad Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 28 Oct 2015 09:39:43 +0100 Subject: [PATCH 1/9] liblinphone: fix potential crash when interpretting URLs --- Classes/ContactDetailsViewController.m | 6 ++++-- Classes/LinphoneManager.m | 6 ++++-- Classes/LinphoneUI/Base.lproj/UICallBar.xib | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m index 7d03e6b0f..29c692297 100644 --- a/Classes/ContactDetailsViewController.m +++ b/Classes/ContactDetailsViewController.m @@ -150,7 +150,8 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info - (void)addCurrentContactContactField:(NSString *)address { LinphoneAddress *linphoneAddress = linphone_address_new(address.UTF8String); - NSString *username = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)]; + NSString *username = + linphoneAddress ? [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)] : address; if (([username rangeOfString:@"@"].length > 0) && ([[LinphoneManager instance] lpConfigBoolForKey:@"show_contacts_emails_preference"] == true)) { @@ -161,7 +162,8 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info } else { [tableController addSipField:address]; } - linphone_address_destroy(linphoneAddress); + if (linphoneAddress) + linphone_address_destroy(linphoneAddress); [self enableEdit:FALSE]; [[tableController tableView] reloadData]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 0376b561f..fdcb4f478 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -961,8 +961,10 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char } else { if ([[LinphoneManager instance] lpConfigBoolForKey:@"show_contacts_emails_preference"] == true) { LinphoneAddress *linphoneAddress = linphone_address_new([address UTF8String]); - address = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)]; - linphone_address_destroy(linphoneAddress); + if (linphoneAddress) { + address = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)]; + linphone_address_destroy(linphoneAddress); + } } } if (address == nil) { diff --git a/Classes/LinphoneUI/Base.lproj/UICallBar.xib b/Classes/LinphoneUI/Base.lproj/UICallBar.xib index f76753d37..2fe10a1af 100644 --- a/Classes/LinphoneUI/Base.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/Base.lproj/UICallBar.xib @@ -1,8 +1,8 @@ - + - + From c0fb9acd09fba447e5647a785eab0d88d71b6dfe Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sat, 31 Oct 2015 11:13:59 +0100 Subject: [PATCH 2/9] update submodules for webrtc interop fixes --- submodules/belle-sip | 2 +- submodules/externals/polarssl | 2 +- submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 611b6c3b1..7e2be4c9f 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783 +Subproject commit 7e2be4c9fe38418fd040a35d6ed4229a283bcd33 diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl index 5e723467b..919006f5f 160000 --- a/submodules/externals/polarssl +++ b/submodules/externals/polarssl @@ -1 +1 @@ -Subproject commit 5e723467b44d2d2128eba54bbad3e80d8dbdac05 +Subproject commit 919006f5f33febe72205078a125fae811b12a3d6 diff --git a/submodules/linphone b/submodules/linphone index b65516c16..933a75d87 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b65516c163831c43a5e7a73184a6fbc036e7931e +Subproject commit 933a75d8734338aa52bf4da7356bd1390eea4b58 From 8757d3df02ed2373a0aba260ed194c2df8fa9276 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 2 Nov 2015 11:18:59 +0100 Subject: [PATCH 3/9] Update belle-sip and linphone-cmake-builder submodules. --- submodules/belle-sip | 2 +- submodules/cmake-builder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 7e2be4c9f..9b72b22e8 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7e2be4c9fe38418fd040a35d6ed4229a283bcd33 +Subproject commit 9b72b22e81db1aeb2782413648dbcde5d41d8067 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index b15272b1b..d559c5db6 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit b15272b1bc3394ae5ed06300bd5babd05a4a94db +Subproject commit d559c5db60c5e44836a5a687857102a8daf6def7 From 51a17663f14b0302151de538f33084ec1945f859 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 2 Nov 2015 22:09:09 +0100 Subject: [PATCH 4/9] enable bitcode for both app and sdk --- linphone.xcodeproj/project.pbxproj | 8 ++++---- submodules/cmake-builder | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 9bc38915e..e5c833521 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4658,7 +4658,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4743,7 +4743,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4828,7 +4828,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4913,7 +4913,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; diff --git a/submodules/cmake-builder b/submodules/cmake-builder index d559c5db6..c54d75da4 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit d559c5db60c5e44836a5a687857102a8daf6def7 +Subproject commit c54d75da40b36a5f591ce8a7d8c2c2597e508b89 From c3637ac4fb868fb031f92b7bd61d0366eac5dc86 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 2 Nov 2015 22:18:21 +0100 Subject: [PATCH 5/9] [Outgrade submodule] Revert "enable bitcode for both app and sdk" because it requires xcode 7 This reverts commit 51a17663f14b0302151de538f33084ec1945f859. --- linphone.xcodeproj/project.pbxproj | 8 ++++---- submodules/cmake-builder | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index e5c833521..9bc38915e 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4658,7 +4658,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4743,7 +4743,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4828,7 +4828,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4913,7 +4913,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; diff --git a/submodules/cmake-builder b/submodules/cmake-builder index c54d75da4..d559c5db6 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit c54d75da40b36a5f591ce8a7d8c2c2597e508b89 +Subproject commit d559c5db60c5e44836a5a687857102a8daf6def7 From 3d3b12ebf9c7cef49d382acf7cd565f2c6869e38 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 3 Nov 2015 10:10:53 +0100 Subject: [PATCH 6/9] Revert "[Outgrade submodule]" This reverts commit c3637ac4fb868fb031f92b7bd61d0366eac5dc86. --- linphone.xcodeproj/project.pbxproj | 8 ++++---- submodules/cmake-builder | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 9bc38915e..e5c833521 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4658,7 +4658,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4743,7 +4743,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4828,7 +4828,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; @@ -4913,7 +4913,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; - ENABLE_BITCODE = NO; + ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; diff --git a/submodules/cmake-builder b/submodules/cmake-builder index d559c5db6..9e27991eb 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit d559c5db60c5e44836a5a687857102a8daf6def7 +Subproject commit 9e27991eb93b7e2b5dfa7d447f42bffab86a4e79 From f33e91ced18cbb56c131c1e9d677ca6f127c95d0 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 29 Oct 2015 15:09:43 +0100 Subject: [PATCH 7/9] LinphoneManager: fix auth popup --- Classes/LinphoneManager.m | 50 +++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index fdcb4f478..6d5f3bb4c 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -889,8 +889,8 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo #pragma mark - Auth info Function -static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char *realm, const char *username, - const char *domain) { +static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char *realmC, const char *usernameC, + const char *domainC) { // let the wizard handle its own errors if ([PhoneMainView.instance currentView] != WizardViewController.compositeViewDescription) { static DTAlertView *alertView = nil; @@ -900,34 +900,42 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char [alertView dismissWithClickedButtonIndex:0 animated:NO]; } + NSString *realm = [NSString stringWithUTF8String:realmC]; + NSString *username = [NSString stringWithUTF8String:usernameC]; + NSString *domain = [NSString stringWithUTF8String:domainC]; alertView = [[DTAlertView alloc] initWithTitle:NSLocalizedString(@"Authentication needed.", nil) message:[NSString stringWithFormat:NSLocalizedString(@"Registration failed because authentication is " - @"missing or invalid for %s@%s.\nYou can " + @"missing or invalid for %@@%@.\nYou can " @"provide password again, or check your " @"account configuration in the settings.", nil), username, realm]]; alertView.alertViewStyle = UIAlertViewStyleSecureTextInput; - [alertView addCancelButtonWithTitle:NSLocalizedString(@"Cancel", nil) block:nil]; - __weak UITextField *passwordField = [alertView textFieldAtIndex:0]; + [alertView addCancelButtonWithTitle:NSLocalizedString(@"Go to settings", nil) + block:^{ + [[PhoneMainView instance] + changeCurrentView:[SettingsViewController compositeViewDescription]]; + }]; - [alertView addButtonWithTitle:NSLocalizedString(@"Continue", nil) - block:^{ - LinphoneAuthInfo *info = (LinphoneAuthInfo *)linphone_core_find_auth_info( - [LinphoneManager getLc], realm, username, domain); - if (info) { - linphone_auth_info_set_passwd(info, passwordField.text.UTF8String); - linphone_auth_info_set_ha1(info, NULL); - linphone_proxy_config_refresh_register( - linphone_core_get_default_proxy_config([LinphoneManager getLc])); - } else { - LOGE(@"Could not find auth info associated with %s@%s, going to settings!", - username, domain); - [[PhoneMainView instance] - changeCurrentView:[SettingsViewController compositeViewDescription]]; - } - }]; + [alertView + addButtonWithTitle:NSLocalizedString(@"Continue", nil) + block:^{ + NSString *password = [alertView textFieldAtIndex:0].text; + LinphoneAuthInfo *info = (LinphoneAuthInfo *)linphone_core_find_auth_info( + [LinphoneManager getLc], realm.UTF8String, username.UTF8String, domain.UTF8String); + if (info) { + linphone_auth_info_set_passwd(info, password.UTF8String); + linphone_auth_info_set_ha1(info, NULL); + } else { + LOGW(@"Could not find auth info associated with %@@%@, creating it", username, domain); + info = linphone_auth_info_new(username.UTF8String, NULL, password.UTF8String, NULL, + realm.UTF8String, domain.UTF8String); + linphone_core_add_auth_info([LinphoneManager getLc], info); + } + linphone_proxy_config_refresh_register( + linphone_core_get_default_proxy_config([LinphoneManager getLc])); + }]; [alertView show]; } } From bf1ad669a72009573d098c101474291fe7391f65 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 2 Nov 2015 09:49:10 +0100 Subject: [PATCH 8/9] LiblinphoneTester: rename catalog to Test* to avoid conflict with Linphone target --- .../AppIcon.appiconset/Contents.json | 88 ------------------ .../TestAppIcon.appiconset/Contents.json | 93 +++++++++++++++++++ .../Contents.json | 0 3 files changed, 93 insertions(+), 88 deletions(-) delete mode 100644 LiblinphoneTester/TesterImages.xcassets/AppIcon.appiconset/Contents.json create mode 100644 LiblinphoneTester/TesterImages.xcassets/TestAppIcon.appiconset/Contents.json rename LiblinphoneTester/TesterImages.xcassets/{LaunchImage.launchimage => TestLaunchImage.launchimage}/Contents.json (100%) diff --git a/LiblinphoneTester/TesterImages.xcassets/AppIcon.appiconset/Contents.json b/LiblinphoneTester/TesterImages.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index da837d9e8..000000000 --- a/LiblinphoneTester/TesterImages.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "scale" : "1x", - "size" : "57x57" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "57x57" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "72x72" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "72x72" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "iphone", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "50x50" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "50x50" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/LiblinphoneTester/TesterImages.xcassets/TestAppIcon.appiconset/Contents.json b/LiblinphoneTester/TesterImages.xcassets/TestAppIcon.appiconset/Contents.json new file mode 100644 index 000000000..ebdf0618a --- /dev/null +++ b/LiblinphoneTester/TesterImages.xcassets/TestAppIcon.appiconset/Contents.json @@ -0,0 +1,93 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "57x57", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "size" : "57x57", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "72x72", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "72x72", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/LiblinphoneTester/TesterImages.xcassets/LaunchImage.launchimage/Contents.json b/LiblinphoneTester/TesterImages.xcassets/TestLaunchImage.launchimage/Contents.json similarity index 100% rename from LiblinphoneTester/TesterImages.xcassets/LaunchImage.launchimage/Contents.json rename to LiblinphoneTester/TesterImages.xcassets/TestLaunchImage.launchimage/Contents.json From 40eb000b984018616c72446d6153fbf4e7258cc5 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 3 Nov 2015 14:33:56 +0100 Subject: [PATCH 9/9] README.md: update instructions for non free codecs --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3dfdc0228..db78384e4 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,13 @@ This SDK can be generated in 2 flavors: ## Customizing features -You can enable all non-free codecs using `--enable-non-free-codecs`. -You can also choose to enable/disable features one by one (custom audio/video codecs, media encryption, etc.). To get a list of all features, the simplest way is to invoke `prepare.py` with `--list-features`: +You can enable non-free codecs by using `--enable-non-free-codecs` and `-DENABLE_=ON`. To get a list of all features, the simplest way is to invoke `prepare.py` with `--list-features`: ./prepare.py --list-features You can for instance enable X264 by using: - ./prepare.py -DENABLE_X264=ON [other options] + ./prepare.py --enable-non-free-codecs -DENABLE_X264=ON [other options] ## Built architectures