eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'videoimpl-refactor' into setup/dakar-bideew-show-2016

Browse Source 
# Conflicts:
#	mapmap.pro
This commit is contained in:
Tats
2016-05-12 10:27:59 +00:00
parent bee45a3491 5d37219833
commit 9cf56ad962
13 changed files with 872 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapmap.pro
+8 -2
View File
@@ -46,7 +46,10 @@ HEADERS = \
Triangle.h \
UidAllocator.h \
Util.h \
VideoImpl.h
VideoImpl.h \
VideoUriDecodeBinImpl.h \
VideoV4l2SrcImpl.h \
VideoShmSrcImpl.h \
SOURCES = \
Commands.cpp \
@@ -83,7 +86,10 @@ SOURCES = \
UidAllocator.cpp \
Util.cpp \
VideoImpl.cpp \
main.cpp \
VideoUriDecodeBinImpl.cpp \
VideoV4l2SrcImpl.cpp \
VideoShmSrcImpl.cpp \
main.cpp
include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri)