diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /avmedia | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/quicktime/player.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 8383d3f3cae6..26b712441692 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; - assert(pEnvData); + OSL_ASSERT(pEnvData); if (pEnvData) { #if defined(ENABLE_GTKSINK) diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index b5fe12db1a39..d1c44306834f 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -56,7 +56,7 @@ Player::~Player() QTMovie* Player::getMovie() { - assert( mpMovie ); + OSL_ASSERT( mpMovie ); return mpMovie; } |