Skip to content

O
opencv
Commit f04cade6 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #1559 from SpecLad:Wnull-conversion

parents b03c19a8 1817a07a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/highgui/src/cap_gstreamer.cpp
View file @ f04cade6
...@@ -134,7 +134,7 @@ protected: ...@@ -134,7 +134,7 @@ protected:
void startPipeline(); void startPipeline();
void stopPipeline(); void stopPipeline();
void restartPipeline(); 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); void removeFilter(const char *filter);
static void newPad(GstElement *myelement, static void newPad(GstElement *myelement,
GstPad *pad, GstPad *pad,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment