Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

This commit is contained in:
Tats
2017-09-22 17:12:52 -04:00
+6 -6
View File
@@ -199,11 +199,15 @@ GstFlowReturn VideoImpl::gstNewSampleCallback(GstElement*, VideoImpl *p)
}
VideoImpl::VideoImpl() :
_width(-1),
_height(-1),
_duration(0),
_seekEnabled(false),
_pipeline(NULL),
_queue0(NULL),
_videoconvert0(NULL),
_capsfilter0(NULL),
_videoscale0(NULL),
_videoconvert0(NULL),
_appsink0(NULL),
_audioqueue0(NULL),
_audioconvert0(NULL),
@@ -214,12 +218,8 @@ _bus(NULL),
_currentFrameSample(NULL),
_currentFrameBuffer(NULL),
_bitsChanged(false),
_width(-1),
_height(-1),
_duration(0),
//_isSeekable(false),
_data(NULL),
_seekEnabled(false),
//_isSeekable(false),
_rate(1.0),
_movieReady(false),
_playState(false),