From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 19 Feb 2015 20:12:16 +0000 (+0100)
Subject: Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'
X-Git-Tag: n2.7-dev~391
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/ac649bb775b9635db6810cb200ef81a777368e4a

Merge commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d'

* commit '11c22dfd495bbd3f38df639772aa4bb9a1be882d':
  configure: add missing h264_qsv hwaccel deps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

ac649bb775b9635db6810cb200ef81a777368e4a
diff --cc configure
index 10d3cf6,8c618be..2696cb2
--- a/configure
+++ b/configure
@@@ -2286,13 -1956,11 +2286,14 @@@ h263_vaapi_hwaccel_deps="vaapi
  h263_vaapi_hwaccel_select="h263_decoder"
  h263_vdpau_hwaccel_deps="vdpau"
  h263_vdpau_hwaccel_select="h263_decoder"
 +h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
  h264_dxva2_hwaccel_deps="dxva2"
  h264_dxva2_hwaccel_select="h264_decoder"
+ h264_qsv_hwaccel_deps="libmfx"
  h264_vaapi_hwaccel_deps="vaapi"
  h264_vaapi_hwaccel_select="h264_decoder"
 +h264_vda_decoder_deps="vda"
 +h264_vda_decoder_select="h264_decoder"
  h264_vda_hwaccel_deps="vda"
  h264_vda_hwaccel_select="h264_decoder"
  h264_vda_old_hwaccel_deps="vda"