[FFmpeg-cvslog] Merge commit '660470cd62c59f25cc52c731af6230e7bc1aba62'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Apr  9 12:41:21 2017 -0300| [e5ac47c06818feb039f00f9f1931c7d4244012d6] | committer: James Almer

Merge commit '660470cd62c59f25cc52c731af6230e7bc1aba62'

* commit '660470cd62c59f25cc52c731af6230e7bc1aba62':
  build: Add missing audio_frame_queue dependency for libwavpack encoder

Merged-by: James Almer <jamrial at gmail.com>

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

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 979ec8fb69..8ad0bda76c 100755
--- a/configure
+++ b/configure
@@ -2885,6 +2885,7 @@ libvpx_vp8_encoder_deps="libvpx"
 libvpx_vp9_decoder_deps="libvpx"
 libvpx_vp9_encoder_deps="libvpx"
 libwavpack_encoder_deps="libwavpack"
+libwavpack_encoder_select="audio_frame_queue"
 libwebp_encoder_deps="libwebp"
 libwebp_anim_encoder_deps="libwebp"
 libx262_encoder_deps="libx262"


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

diff --cc configure
index 979ec8fb69,43506debdc..8ad0bda76c
--- a/configure
+++ b/configure
@@@ -2885,21 -2283,13 +2885,22 @@@ libvpx_vp8_encoder_deps="libvpx
  libvpx_vp9_decoder_deps="libvpx"
  libvpx_vp9_encoder_deps="libvpx"
  libwavpack_encoder_deps="libwavpack"
+ libwavpack_encoder_select="audio_frame_queue"
  libwebp_encoder_deps="libwebp"
 +libwebp_anim_encoder_deps="libwebp"
  libx262_encoder_deps="libx262"
  libx264_encoder_deps="libx264"
 +libx264rgb_encoder_deps="libx264 x264_csp_bgr"
 +libx264rgb_encoder_select="libx264_encoder"
  libx265_encoder_deps="libx265"
  libxavs_encoder_deps="libxavs"
 -libxvid_encoder_deps="libxvid mkstemp"
 +libxvid_encoder_deps="libxvid"
 +libzvbi_teletext_decoder_deps="libzvbi"
 +videotoolbox_deps="VideoToolbox_VideoToolbox_h"
 +videotoolbox_extralibs="-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo"
 +videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
 +videotoolbox_encoder_suggest="vda_framework vt_bt2020"
 +vt_bt2020_deps="kCVImageBufferColorPrimaries_ITU_R_2020"
  
  # demuxers / muxers
  ac3_demuxer_select="ac3_parser"