Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2017-07-11 18:51:09 +01:00
commit a42494a29e
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -144,6 +144,7 @@ SET( CMAKE_CXX_FLAGS "" )
# Configure targets
######################################################################################
SET(CMAKE_CXX_STANDARD 14)
if(CMAKE_COMPILER_IS_GNUCXX)
ADD_DEFINITIONS(-std=gnu++0x)
endif()
+1 -1
View File
@@ -28,7 +28,7 @@
#include "PlaYUVerFramePixelFormats.h"
#include <cstdio>
#if( ( LIBAVCODEC_VERSION_MAJOR >= 57 ) && ( LIBAVCODEC_VERSION_MINOR >= 64 ) )
#if( ( LIBAVCODEC_VERSION_MAJOR >= 57 ) && ( LIBAVCODEC_VERSION_MINOR >= 24 ) )
#define FF_USER_CODEC_PARAM
#endif