avmodel: expose useAVframe, currentAVFrame on non-DBus platforms

Change-Id: Ia2714fb137b41566c653dbb1ec18e7b65e325084

avmodel: expose useAVframe, currentAVFrame on non-DBus platforms
Change-Id: Ia2714fb137b41566c653dbb1ec18e7b65e325084
b2efc99d · Yang Wang · Andreas Traczyk · 9033db9d · b2efc99d · b2efc99d
Commit b2efc99d authored Dec 02, 2019 by Yang Wang Committed by Andreas Traczyk Dec 03, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

src/api/newvideo.h src/api/newvideo.h +1 -1

src/newvideo.cpp src/newvideo.cpp +1 -1

src/video/renderer.h src/video/renderer.h +1 -1

No files found.
--- a/src/api/newvideo.h
+++ b/src/api/newvideo.h
@@ -136,7 +136,7 @@ public:
     */
    Frame currentFrame() const;

-#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
+#if defined(ENABLE_LIBWRAP)
    /**
     * @return current avframe
     */

--- a/src/newvideo.cpp
+++ b/src/newvideo.cpp
@@ -163,7 +163,7 @@ Renderer::currentFrame() const
    return result;
 }

-#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
+#if defined(ENABLE_LIBWRAP)
 std::unique_ptr<AVFrame, void(*)(AVFrame*)>
 Renderer::currentAVFrame() const
 {

--- a/src/video/renderer.h
+++ b/src/video/renderer.h
@@ -98,7 +98,7 @@ public:
   virtual QSize      size            () const;
   virtual QMutex*    mutex           () const;
   virtual ColorSpace colorSpace      () const = 0;
-#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
+#if defined(ENABLE_LIBWRAP)
   virtual std::unique_ptr<AVFrame, void(*)(AVFrame*)> currentAVFrame() const = 0;
 #endif
   void setSize(const QSize& size) const;