mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5841 from akallabeth/vaapi_fixes

Browse Source 
Vaapi fixes
This commit is contained in:
Martin Fleisz 2020-01-16 10:17:10 +01:00 committed by GitHub
commit 9099682f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/ConfigOptions.cmake
View File

@ -145,6 +145,7 @@ option(WITH_GSSAPI "Compile support for kerberos authentication. (EXPERIMENTAL)"
option(WITH_DSP_EXPERIMENTAL "Enable experimental sound encoder/decoder formats" OFF)
if (WITH_FFMPEG)
option(WITH_DSP_FFMPEG "Use FFMPEG for audio encoding/decoding" OFF)
option(WITH_VAAPI "Use FFMPEG VAAPI" OFF)
endif(WITH_FFMPEG)
option(USE_VERSION_FROM_GIT_TAG "Extract FreeRDP version from git tag." OFF)
@ -163,4 +164,4 @@ endif(IOS)
if (WITH_SERVER)
# Proxy Options
option(WITH_PROXY_MODULES "Compile proxy modules" OFF)
endif()
endif()

2
libfreerdp/codec/h264_ffmpeg.c
View File

@ -448,7 +448,7 @@ static enum AVPixelFormat libavcodec_get_format(struct AVCodecContext* ctx,
const enum AVPixelFormat* fmts)
{
H264_CONTEXT* h264 = (H264_CONTEXT*)ctx->opaque;
H264_CONTEXT_LIBAVCODEC* sys = (H264_CONTEXT_LIBAVCODEC*)h264->subsystem;
H264_CONTEXT_LIBAVCODEC* sys = (H264_CONTEXT_LIBAVCODEC*)h264->pSystemData;
const enum AVPixelFormat* p;
for (p = fmts; *p != AV_PIX_FMT_NONE; p++)