[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - avmedia/source

[Caolán McNamara]

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

New commits:
commit 5fdfacd425d71c85aa6a74a72d607e2cb7658e86
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 10 14:05:37 2016 +0000

    fix for 10 sec hang with audio-only formats with gstreamer1
    
    just do the same as we did for gstreamer 0.10 and set the
    size found condition once we get the message even if there is no size
    
    Change-Id: I826d76dd1097432e5bd33d4acc1a187b8e5068da
    (cherry picked from commit 702790258c6b3ec05ce04f7c2839a48776381535)
    Reviewed-on: https://gerrit.libreoffice.org/23118
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index a5a6c2f..310cf9b 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -555,11 +555,12 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
 
                     SAL_INFO( "avmedia.gstreamer", AVVERSION "queried size: " << mnWidth << "x" << mnHeight );
 
-                    maSizeCondition.set();
                 }
                 gst_caps_unref( caps );
                 g_object_unref( pad );
             }
+
+            maSizeCondition.set();
         }
 #endif
     } else if (gst_is_missing_plugin_message(message)) {