selim mustafaev 4392ebea1c Merge remote-tracking branch 'origin/master' ... # Conflicts: # examples/ffPlayer.cpp		2017-11-06 17:08:08 +03:00
..
CMakeLists.txt	Merge remote-tracking branch 'origin/master'	2017-11-06 17:08:08 +03:00
ffConv.cpp	Added some code to support playing audio	2017-11-06 17:05:51 +03:00
ffPlayer.cpp	Added some code to support playing audio	2017-11-06 17:05:51 +03:00
ffPreview.cpp	more use of smart pointers	2017-03-31 00:36:49 +03:00