diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-02 14:43:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-02 14:43:22 +0200 |
| commit | ed8186531beb13d03e0041440c5d784177951516 (patch) | |
| tree | 92caa54044f8bad48f6019a93996bf53d963935c /avmedia | |
| parent | 6a370f580aaf060004536dfc8ca877c9a2114c66 (diff) | |
-Werror,-Wdeprecated-declarations
Change-Id: I9ca369fb5dcb4210db6740eac577e9144b288005
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/macavf/framegrabber.mm | 3 | ||||
| -rw-r--r-- | avmedia/source/macavf/player.mm | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 12d53cb999c1..c23e4a2de646 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 257576db2151..b3cd425eee52 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]; |