| Message ID | 20161112010229.12592-1-h.leppkes@gmail.com |
|---|---|
| State | Accepted |
| Commit | 99218ee30d7c1a3c49cf5f45a8b4cb4cd34d8199 |
| Headers | show |
On Sat, Nov 12, 2016 at 2:02 AM, Hendrik Leppkes <h.leppkes@gmail.com> wrote: > Fixes building with --disable-everything --enable-shared --enable-dxva2 > > The hwcontext DXVA2 implementation in avutil needs this library now, instead > of just the ffmpeg program. > --- > configure | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index c00c591..b55bbd9 100755 > --- a/configure > +++ b/configure > @@ -2539,6 +2539,7 @@ crystalhd_deps="libcrystalhd_libcrystalhd_if_h" > cuvid_deps="cuda" > d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext" > dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" > +dxva2_extralibs="-luser32" > vaapi_deps="va_va_h" > vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h" > vda_framework_extralibs="-framework VideoDecodeAcceleration" > @@ -6317,7 +6318,7 @@ if test $target_os = "haiku"; then > fi > > enabled_all dxva2 dxva2api_cobj CoTaskMemFree && > - prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") && > + prepend ffmpeg_libs $($ldflags_filter "-lole32") && > enable dxva2_lib > > ! enabled_any memalign posix_memalign aligned_malloc && > -- > 2.10.1.windows.1 > Ping? I'll apply this soon as it fixes the build in one of my real-world configurations. - Hendrik
On Sun, Nov 13, 2016 at 10:18 AM, Hendrik Leppkes <h.leppkes@gmail.com> wrote: > On Sat, Nov 12, 2016 at 2:02 AM, Hendrik Leppkes <h.leppkes@gmail.com> wrote: >> Fixes building with --disable-everything --enable-shared --enable-dxva2 >> >> The hwcontext DXVA2 implementation in avutil needs this library now, instead >> of just the ffmpeg program. >> --- >> configure | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/configure b/configure >> index c00c591..b55bbd9 100755 >> --- a/configure >> +++ b/configure >> @@ -2539,6 +2539,7 @@ crystalhd_deps="libcrystalhd_libcrystalhd_if_h" >> cuvid_deps="cuda" >> d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext" >> dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" >> +dxva2_extralibs="-luser32" >> vaapi_deps="va_va_h" >> vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h" >> vda_framework_extralibs="-framework VideoDecodeAcceleration" >> @@ -6317,7 +6318,7 @@ if test $target_os = "haiku"; then >> fi >> >> enabled_all dxva2 dxva2api_cobj CoTaskMemFree && >> - prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") && >> + prepend ffmpeg_libs $($ldflags_filter "-lole32") && >> enable dxva2_lib >> >> ! enabled_any memalign posix_memalign aligned_malloc && >> -- >> 2.10.1.windows.1 >> > > Ping? > I'll apply this soon as it fixes the build in one of my real-world > configurations. > Pushed. - Hendrik
diff --git a/configure b/configure index c00c591..b55bbd9 100755 --- a/configure +++ b/configure @@ -2539,6 +2539,7 @@ crystalhd_deps="libcrystalhd_libcrystalhd_if_h" cuvid_deps="cuda" d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode" +dxva2_extralibs="-luser32" vaapi_deps="va_va_h" vda_framework_deps="VideoDecodeAcceleration_VDADecoder_h" vda_framework_extralibs="-framework VideoDecodeAcceleration" @@ -6317,7 +6318,7 @@ if test $target_os = "haiku"; then fi enabled_all dxva2 dxva2api_cobj CoTaskMemFree && - prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") && + prepend ffmpeg_libs $($ldflags_filter "-lole32") && enable dxva2_lib ! enabled_any memalign posix_memalign aligned_malloc &&