Merge pull request #1559 from SpecLad:Wnull-conversion

12 years ago · f04cade607
parent b03c19a8ac 1817a07a5e
commit f04cade607
1 changed files with 1 additions and 1 deletions
--- 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,