[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - avmedia/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 3 20:29:24 UTC 2019


 avmedia/source/gstreamer/gstplayer.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e8eb9cf446ea6525284749f78fce6623170cb39b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Feb 19 10:18:16 2019 +0000
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Mon Jun 3 22:28:40 2019 +0200

    gst 0.10 doesn't have gst_video_overlay_set_render_rectangle
    
    Change-Id: I499e32ce86fabd18c52ac2f99713af0933572f7c
    (cherry picked from commit abd6f2a38506f512d4846cf43a9fc9576d96ceb3)
    Reviewed-on: https://gerrit.libreoffice.org/73395
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index fb2193b3f67d..e900ed96ba47 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -515,9 +515,10 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
             if ( mnWindowID != 0 )
             {
                 gst_video_overlay_set_window_handle( mpXOverlay, mnWindowID );
-
+#ifndef AVMEDIA_GST_0_10
                 if (maArea.Width > 0 && maArea.Height > 0)
                     gst_video_overlay_set_render_rectangle(mpXOverlay, maArea.X, maArea.Y, maArea.Width, maArea.Height);
+#endif
             }
 
             return GST_BUS_DROP;


More information about the Libreoffice-commits mailing list