summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-12-10 08:06:06 +0100
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:25:49 -0400
commit5e94b28f3392f544d52a72836521be9168db2768 (patch)
treef0e152e0e42128543958487e8e3e81d94a58a750 /avmedia
parent9eef06f0db88461e9efa92c8cac6107200f7b942 (diff)
loplugin:nullptr: More NULL -> nullptr automatic rewrite
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d (cherry picked from commit fb8a3fac5d448451794804a7470be45fa14da453)
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.cxx4
-rw-r--r--avmedia/source/vlc/wrapper/SymbolLoader.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 11dae9f54295..7904885fc149 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -127,12 +127,12 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
// synchronously fetch the frame
#ifdef AVMEDIA_GST_0_10
- g_signal_emit_by_name( pSink, "pull-preroll", &pBuf, NULL );
+ g_signal_emit_by_name( pSink, "pull-preroll", &pBuf, nullptr );
if( pBuf )
pCaps = GST_BUFFER_CAPS( pBuf );
#else
GstSample *pSample = nullptr;
- g_signal_emit_by_name( pSink, "pull-preroll", &pSample, NULL );
+ g_signal_emit_by_name( pSink, "pull-preroll", &pSample, nullptr );
if( pSample )
{
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 3cf33b6afb2a..8e3faf41b975 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -79,7 +79,7 @@ namespace
if ( !aMethod )
{
SAL_WARN("avmedia", "Cannot load method " << pMap[ i ].symName);
- *pMap[ i ].refValue = NULL;
+ *pMap[ i ].refValue = nullptr;
return false;
}
else