summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 10:29:59 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 10:29:59 +1000
commitff76c90fb40c4246a835686ca0b4db8fe6b7dbd1 (patch)
treeaf883dd15617ed8669d0d6fa10ef1c2f6cb2bccd /avmedia
parent0483e756e99d7762151fd529f073f6cf24474613 (diff)
tdf#43157: convert avmedia module away from OSL_ASSERT to assert
Change-Id: Ie484788019f11299c4e4796268507b9b16b7fd4a
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/gstreamer/gstplayer.cxx2
-rw-r--r--avmedia/source/quicktime/player.mm2
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 26b712441692..8383d3f3cae6 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -910,7 +910,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
rArguments[ 2 ] >>= pIntPtr;
SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr );
const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : nullptr;
- OSL_ASSERT(pEnvData);
+ assert(pEnvData);
if (pEnvData)
{
#if defined(ENABLE_GTKSINK)
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index d1c44306834f..b5fe12db1a39 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -56,7 +56,7 @@ Player::~Player()
QTMovie* Player::getMovie()
{
- OSL_ASSERT( mpMovie );
+ assert( mpMovie );
return mpMovie;
}