Merge pull request #1559 from SpecLad:Wnull-conversion

f04cade6 · Roman Donchenko · OpenCV Buildbot · b03c19a8 · 1817a07a · f04cade6
Commit f04cade6 authored Oct 04, 2013 by Roman Donchenko Committed by OpenCV Buildbot Oct 04, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cap_gstreamer.cpp modules/highgui/src/cap_gstreamer.cpp +1 -1

No files found.
--- a/modules/highgui/src/cap_gstreamer.cpp
+++ b/modules/highgui/src/cap_gstreamer.cpp
@@ -134,7 +134,7 @@ protected:
    void startPipeline();
    void stopPipeline();
    void restartPipeline();
-    void setFilter(const char* prop, int type, int v1, int v2 = NULL);
+    void setFilter(const char* prop, int type, int v1, int v2 = 0);
    void removeFilter(const char *filter);
    static void newPad(GstElement *myelement,
                       GstPad     *pad,