diff options
| author | Scott <[email protected]> | 2015-09-24 20:31:05 +0100 |
|---|---|---|
| committer | Scott <[email protected]> | 2015-09-24 20:31:05 +0100 |
| commit | bf85b6277de7fc00bb66cc858d880e190aba59c4 (patch) | |
| tree | b7c234c22e13e3770c197ff23758cffb1e51c221 | |
| parent | 78182d366b6f1981bd4300192dc174dd2123f4f5 (diff) | |
| parent | a405fbf3d946bd1730eef761f0b43cae04d1ef8f (diff) | |
Merge pull request #6 from maximd33/master
Report in MASK form for supported codec(s)
| -rw-r--r-- | libhb/qsv_common.c | 4 | ||||
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c index 12f4d5e7b..c50be8901 100644 --- a/libhb/qsv_common.c +++ b/libhb/qsv_common.c @@ -144,8 +144,8 @@ static int qsv_implementation_is_hardware(mfxIMPL implementation) int hb_qsv_available() { - return (hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H264) || - hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H265)); + return (hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H264) ? HB_VCODEC_QSV_H264 : 0 | + hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H265) ? HB_VCODEC_QSV_H265 : 0); } int hb_qsv_video_encoder_is_enabled(int encoder) diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs index ffe00d679..2055fab90 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/SystemInfo.cs @@ -1,4 +1,4 @@ -// --------------------------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
// <copyright file="SystemInfo.cs" company="HandBrake Project (http://handbrake.fr)">
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
@@ -71,7 +71,7 @@ namespace HandBrake.ApplicationServices.Utilities {
try
{
- return HBFunctions.hb_qsv_available() == 1;
+ return HBFunctions.hb_qsv_available() != 0;
}
catch (Exception)
{
|