Merge branch 'master' into devel
This commit is contained in:
commit
a42494a29e
2 files changed
+2
-1
No files matched your search
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user