Merge branch 'hardware-support' of github.com:OpenShot/libopenshot into hardware-support

This commit is contained in:
Jonathan Thomas
2018-09-18 14:46:18 -05:00
2 changed files with 12 additions and 0 deletions

View File

@@ -32,6 +32,12 @@
using namespace openshot;
#if IS_FFMPEG_3_2
#pragma message "You are compiling with experimental hardware encode"
#else
#pragma message "You are compiling only with software encode"
#endif
#if IS_FFMPEG_3_2
int hw_en_on = 1; // Is set in UI
int hw_en_supported = 0; // Is set by FFmpegWriter