summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-03-10 14:05:37 +0000
committerAndras Timar <andras.timar@collabora.com>2016-03-17 14:25:51 +0100
commit16c7f233054c380bb927350d46aead7f19ed5d19 (patch)
treecb56edfea7a8e018e814d4af5a41ed40e8373c94 /avmedia
parentb73d817f8083479ded4b1d911b9d111815d13bd0 (diff)
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/23119 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 0a48ffb81c62f804d5c9d7f2dd1332385849d7ee)
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/gstreamer/gstplayer.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index d12e8e932467..b820ae1e802c 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -549,11 +549,12 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
DBG( "queried size: %d x %d", mnWidth, mnHeight );
- maSizeCondition.set();
}
gst_caps_unref( caps );
g_object_unref( pad );
}
+
+ maSizeCondition.set();
}
#endif
} else if (gst_is_missing_plugin_message(message)) {