Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-03-04 20:02:25 +00:00
commit ada2e865e1
8 files changed
+251 -28

No files matched your search

+2
View File
@@ -35,6 +35,7 @@ namespace plaYUVer
{
class LibAvContextHandle;
class LibOpenCVHandler;
typedef struct
{
@@ -57,6 +58,7 @@ private:
{
INVALID_HANDLER = -1,
YUV_IO,
OPENCV_HANDLER,
FFMPEG,
TOTAL_HANDLERR
};