Merge pull request #1559 from SpecLad:Wnull-conversion

This commit is contained in:
Roman Donchenko 2013-10-04 16:08:53 +04:00 committed by OpenCV Buildbot
commit f04cade607

View File

@ -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,