Commit 990e4a66 authored by Anton Khirnov's avatar Anton Khirnov

Add a QSV decoding example.

parent ea1d0b7e
...@@ -1137,6 +1137,7 @@ EXAMPLE_LIST=" ...@@ -1137,6 +1137,7 @@ EXAMPLE_LIST="
filter_audio_example filter_audio_example
metadata_example metadata_example
output_example output_example
qsvdec_example
transcode_aac_example transcode_aac_example
" "
...@@ -1550,6 +1551,7 @@ HAVE_LIST=" ...@@ -1550,6 +1551,7 @@ HAVE_LIST="
sdl sdl
section_data_rel_ro section_data_rel_ro
threads threads
vaapi_x11
vdpau_x11 vdpau_x11
xlib xlib
" "
...@@ -2187,6 +2189,7 @@ avcodec_example_deps="avcodec avutil" ...@@ -2187,6 +2189,7 @@ avcodec_example_deps="avcodec avutil"
filter_audio_example_deps="avfilter avutil" filter_audio_example_deps="avfilter avutil"
metadata_example_deps="avformat avutil" metadata_example_deps="avformat avutil"
output_example_deps="avcodec avformat avutil swscale" output_example_deps="avcodec avformat avutil swscale"
qsvdec_example_deps="avcodec avutil libmfx h264_qsv_decoder vaapi_x11"
transcode_aac_example_deps="avcodec avformat avresample" transcode_aac_example_deps="avcodec avformat avresample"
# libraries, in linking order # libraries, in linking order
...@@ -4330,6 +4333,10 @@ if enabled x11grab; then ...@@ -4330,6 +4333,10 @@ if enabled x11grab; then
require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes
fi fi
enabled vaapi && enabled xlib &&
check_lib2 "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 &&
enable vaapi_x11
enabled vdpau && enabled vdpau &&
check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" || check_cpp_condition vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" ||
disable vdpau disable vdpau
......
...@@ -19,6 +19,7 @@ DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec ...@@ -19,6 +19,7 @@ DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec
DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio
DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata
DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE) += output DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE) += output
DOC_EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE) += qsvdec
DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac
ALL_DOC_EXAMPLES = avcodec filter_audio metadata output transcode_aac ALL_DOC_EXAMPLES = avcodec filter_audio metadata output transcode_aac
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment