[Libreoffice-commits] core.git: avmedia/source

[Stephan Bergmann]

 avmedia/source/macavf/framegrabber.mm |    3 +++
 avmedia/source/macavf/player.mm       |    3 +++
 2 files changed, 6 insertions(+)

New commits:
commit ed8186531beb13d03e0041440c5d784177951516
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 2 14:43:22 2015 +0200

    -Werror,-Wdeprecated-declarations
    
    Change-Id: I9ca369fb5dcb4210db6740eac577e9144b288005

diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm
index 12d53cb..c23e4a2d 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -50,7 +50,10 @@ FrameGrabber::~FrameGrabber()
 bool FrameGrabber::create( const ::rtl::OUString& rURL )
 {
     NSString* pNSStr = [NSString stringWithCharacters:rURL.getStr() length:rURL.getLength()];
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
+        //TODO: 10.11 stringByAddingPercentEscapesUsingEncoding
     NSURL* pNSURL = [NSURL URLWithString: [pNSStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     AVAsset* pMovie = [AVURLAsset URLAssetWithURL:pNSURL options:nil];
     if( !pMovie )
     {
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 257576d..b3cd425 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -123,7 +123,10 @@ bool Player::create( const ::rtl::OUString& rURL )
 {
     // get the media asset
     NSString* aNSStr = [NSString stringWithCharacters:rURL.getStr() length:rURL.getLength()];
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
+        //TODO: 10.11 stringByAddingPercentEscapesUsingEncoding
     NSURL* aNSURL = [NSURL URLWithString: [aNSStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     // get the matching AVPlayerItem
     AVPlayerItem* pPlayerItem = [AVPlayerItem playerItemWithURL:aNSURL];