avmedia/source/macavf/framegrabber.hxx | 1 - avmedia/source/macavf/framegrabber.mm | 18 ------------------ 2 files changed, 19 deletions(-)
New commits: commit 5ec76e598899a9939fa1f3bceab1caae5dfd1a67 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Feb 22 16:52:56 2018 +0200 Bin unused function Change-Id: I38e9f2e21fdb7cfeb379278e9300e6451c8b970d diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx index ee1ccaac1199..9d9d436b042a 100644 --- a/avmedia/source/macavf/framegrabber.hxx +++ b/avmedia/source/macavf/framegrabber.hxx @@ -35,7 +35,6 @@ public: explicit FrameGrabber( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); virtual ~FrameGrabber() override; - bool create( const ::rtl::OUString& rURL ); bool create( AVAsset* pMovie ); // XFrameGrabber diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index 2293a05ba03a..07bf7000bbcb 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -41,24 +41,6 @@ FrameGrabber::~FrameGrabber() } -bool FrameGrabber::create( const ::rtl::OUString& rURL ) -{ - NSString* pNSStr = [NSString stringWithCharacters:reinterpret_cast<unichar const *>(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 ) - { - SAL_WARN("avmedia", "AVGrabber::create() cannot load url=" << [pNSStr UTF8String] ); - return false; - } - - return create( pMovie ); -} - - bool FrameGrabber::create( AVAsset* pMovie ) { if( [[pMovie tracksWithMediaType:AVMediaTypeVideo] count] == 0) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits