Commit graph

4 commits

Author SHA1 Message Date
John Preston
d806d079a2 Merge branch 'master' into video
Conflicts:
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/ui/animation.cpp
	Telegram/Telegram.pro
2016-07-11 21:12:10 +03:00
John Preston
41cd427834 Sync video frame delay / skip by audio play progress. 2016-07-10 22:44:55 +03:00
John Preston
98fe307cbf Packet queue instead of single packet is used in ffmpeg clip reader. 2016-07-05 20:43:30 +03:00
John Preston
d64892584d ClipReader was moved to a separate namespace and different files. 2016-06-24 13:37:29 +03:00