[FFmpeg-cvslog] Merge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 11:29:34 2017 +0200| [ab04d9bf6383c74b5e03761e40b05d59ba270d22] | committer: Clément Bœsch

Merge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'

* commit 'ffe89e1edb0281ff65d1bda88253784e9283b717':
  configure: Move mjpeg_vaapi_decoder dependency declarations to the right place

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab04d9bf6383c74b5e03761e40b05d59ba270d22
---

 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index b6eb1f9..adaf1a3 100755
--- a/configure
+++ b/configure
@@ -2461,8 +2461,6 @@ mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
 mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables"
 mjpeg_encoder_select="aandcttables jpegtables mpegvideoenc"
 mjpegb_decoder_select="mjpeg_decoder"
-mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
-mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 mlp_decoder_select="mlp_parser"
 motionpixels_decoder_select="bswapdsp"
 mp1_decoder_select="mpegaudio"
@@ -2654,6 +2652,8 @@ hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
 hevc_vdpau_hwaccel_select="hevc_decoder"
 mjpeg_cuvid_hwaccel_deps="cuda cuvid"
 mjpeg_cuvid_hwaccel_select="mjpeg_cuvid_decoder"
+mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
+mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 mpeg_vdpau_decoder_deps="vdpau"
 mpeg_vdpau_decoder_select="mpeg2video_decoder"
 mpeg_xvmc_hwaccel_deps="xvmc"


======================================================================

diff --cc configure
index b6eb1f9,6470878..adaf1a3
--- a/configure
+++ b/configure
@@@ -2458,11 -2011,9 +2458,9 @@@ magicyuv_decoder_select="llviddsp
  mdec_decoder_select="blockdsp idctdsp mpegvideo"
  metasound_decoder_select="lsp mdct sinewin"
  mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
 -mjpeg_decoder_select="blockdsp hpeldsp idctdsp jpegtables"
 +mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables"
  mjpeg_encoder_select="aandcttables jpegtables mpegvideoenc"
  mjpegb_decoder_select="mjpeg_decoder"
- mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
- mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
  mlp_decoder_select="mlp_parser"
  motionpixels_decoder_select="bswapdsp"
  mp1_decoder_select="mpegaudio"
@@@ -2648,29 -2154,12 +2646,31 @@@ hevc_mediacodec_decoder_select="hevc_mp
  hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
  hevc_dxva2_hwaccel_select="hevc_decoder"
  hevc_qsv_hwaccel_deps="libmfx"
 +hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC"
 +hevc_vaapi_hwaccel_select="hevc_decoder"
  hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC"
  hevc_vdpau_hwaccel_select="hevc_decoder"
 +mjpeg_cuvid_hwaccel_deps="cuda cuvid"
 +mjpeg_cuvid_hwaccel_select="mjpeg_cuvid_decoder"
+ mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
+ mjpeg_vaapi_encoder_select="vaapi_encode jpegtables"
 +mpeg_vdpau_decoder_deps="vdpau"
 +mpeg_vdpau_decoder_select="mpeg2video_decoder"
 +mpeg_xvmc_hwaccel_deps="xvmc"
 +mpeg_xvmc_hwaccel_select="mpeg2video_decoder"
 +mpeg1_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg1_cuvid_hwaccel_select="mpeg1_cuvid_decoder"
 +mpeg1_vdpau_decoder_deps="vdpau"
 +mpeg1_vdpau_decoder_select="mpeg1video_decoder"
  mpeg1_vdpau_hwaccel_deps="vdpau"
  mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
 +mpeg1_videotoolbox_hwaccel_deps="videotoolbox"
 +mpeg1_videotoolbox_hwaccel_select="mpeg1video_decoder"
 +mpeg1_xvmc_hwaccel_deps="xvmc"
 +mpeg1_xvmc_hwaccel_select="mpeg1video_decoder"
 +mpeg2_crystalhd_decoder_select="crystalhd"
 +mpeg2_cuvid_hwaccel_deps="cuda cuvid"
 +mpeg2_cuvid_hwaccel_select="mpeg2_cuvid_decoder"
  mpeg2_d3d11va_hwaccel_deps="d3d11va"
  mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
  mpeg2_dxva2_hwaccel_deps="dxva2"