virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'

Browse Source 
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
  avconv: VAAPI hwcontext initialisation and hwaccel helper

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-05-08 22:39:20 +01:00
parent 01938585f4 5d273d3efa
commit 172d3568b3
7 changed files with 708 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -2000,6 +2000,7 @@ HAVE_LIST="
section_data_rel_ro
texi2html
threads
vaapi_drm
vaapi_x11
vdpau_x11
winrt
@@ -5872,10 +5873,15 @@ enabled vaapi &&
check_code cc "va/va.h" "vaCreateSurfaces(0, 0, 0, 0, 0, 0, 0, 0)" ||
disable vaapi
enabled vaapi && enabled xlib &&
if enabled vaapi ; then
enabled xlib &&
check_lib2 "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 &&
enable vaapi_x11
check_lib2 "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm &&
enable vaapi_drm
fi
enabled vdpau &&
check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
disable vdpau