1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

9 Commits

Author SHA1 Message Date
derMart
7d11e9192c 0x0 resolution removed
better camera initializing in av settings
2015-01-12 18:08:14 +01:00
Maximilian Wuttke
e0cb122abe Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
	qtox.pro

Conflicts:
	src/coreav.cpp
2014-12-14 10:55:38 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
434808cd67
Add audio in/out device to settings 2014-10-28 21:21:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8501f3e543
Add audio in/out device list (stubs)
Clicking through the list currently has no effect
2014-10-28 20:47:20 +01:00
krepa098
15851604cd moved video stuff to src/video 2014-10-24 16:02:55 +02:00
krepa098
c5dfb33999 non-blocking cam communication, fixed CameraWorker::probeResolutions ...
called from wrong thread, try fix #408 and #495
2014-10-24 16:02:07 +02:00
krepa098
f2b730cdb9 NetVideoSource, YUV shader, fixes 2014-10-17 09:09:59 +02:00
dubslow
bf75750166 Merge branch 'master' into src
Conflicts:
	qtox.pro
	src/widget/form/settings/avform.h
	src/widget/selfcamview.cpp
	src/widget/selfcamview.h
	src/widget/widget.cpp
	widget/selfcamview.h
	widget/videosurface.h
2014-10-10 17:21:54 -05:00
dubslow
3ba95d82ae Move code into src/ 2014-10-07 23:26:25 -05:00