Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'

* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
  configure: don't enable tls protocols if network is disabled

Conflicts:
configure

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

libopenjpegdec: register logging callback functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

libopenjpegenc: use variable instead of type for sizeof

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

libopenjpegenc: add NULL check for img before accessing it

If opj_image_create fails to allocate an image it returns NULL, which
causes a segmentation fault at 'img->x0 = 0'.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

configure: Remove now redundant vsx setting code

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

configure: don't enable tls protocols if network is disabled

This was a regression introduced with d8ffb2055f0e0fcb5d025bab72eb19c2a886c125.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

avfilter/vf_blend: add hardmix mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/vf_blend: fix vividlight blend mode

Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/vf_blend: clip result for divide blend mode

Pointed-out-by: Rudolf Polzer
Signed-off-by: Paul B Mahol <onemda@gmail.com>

configure: Do not dump the whole environment to stdout

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

Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'

* commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d':
  configure: Use pkg-config for fdk-aac

Conflicts:
configure

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

Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'

* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
  configure: Provide an option to override the environment

Conflicts:
configure

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

Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'

* commit '06db45523c1068c24f049ef2b20fcdead3bf36d8':
  configure: Support the extended pkgconf syntax

Conflicts:
configure

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

avformat/sbgdec: Check alloc_array_elem() return value

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/flacenc: Simplify sizeof()

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

avcodec/proresenc_anatoliy: Check av_frame_alloc() return code

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

compat/os2threads: Check av_malloc() return code

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

ffserver: check return code of avio_alloc_context()

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

avformat/mxfdec: return error instead of segfaulting if there are no streams

Fixes segfault from ticket 4350

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

avcodec: loongson3 optimized h264chroma put and avg with mmi

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

configure: Use pkg-config for fdk-aac

Makes the life of the people already setting PKG_CONFIG_PATH simpler.

configure: Provide an option to override the environment

Useful to have `make config` work with custom pkgconf path.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

configure: Support the extended pkgconf syntax

Make possible to require a combination of
packages and/or pin specific versions.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functions (qpel as well as epel) in new file hevc_mc_bi_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Adds HEVC specific macros (needed for this patch) in libavcodec/mips/hevc_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8349bedfa5eac7f261ac43053a2f66b894bac288'

* commit '8349bedfa5eac7f261ac43053a2f66b894bac288':
  configure: Remove some unnecessary exported config items

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

Merge commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7'

* commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7':
  configure: Require LPDIRECT3DSURFACE9 for dxva2

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

Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'

* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
libavcodec/dxva2.c

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

configure: don't enable any tls protocol if network is disabled

This was a regression introduced with 4a006b9eb7e7d736fd00e6045b5612978ef6404b.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/snowenc: avoid floats in the rangecoder initialization

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

configure: Remove some unnecessary exported config items

The only need to be listed if they are to be used in ifdefs from
within the code - config items used as dependencies only within
configure don't need to be exported.

Signed-off-by: Martin Storsjö <martin@martin.st>

configure: Require LPDIRECT3DSURFACE9 for dxva2

This fixes dxva2 detection (i.e. correctly realizes that it isn't
available) for WinRT, where dxva2api.h does exist, but these definitions
are omitted (when targeting the API subsets).

Ideally we should rather check for e.g. DXVA2_ConfigPictureDecode,
but configure might fail to find that definition due to _WIN32_WINNT
not being set to the right value during configure. (libavcodec/dxva2.h
manually overrides the _WIN32_WINNT define.)

This allows removing hardcoded --disable-dxva2 from such build
configurations.

Signed-off-by: Martin Storsjö <martin@martin.st>

dxva2: Add ifdefs around structs that might not be available

Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/rangecoder: avoid float operation

Use integers, avoid potential rounding issues

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

avcodec/Makefile: fix checkheaders for nvenc_b

Signed-off-by: James Almer <jamrial@gmail.com>

doc/formats.texi: document max_interlave_delta muxing option

The option was added in commit d9ae1031f5edbd25c8526b4cb51aba66d3bee931
but it was never documented. The text is based on the one written by the
commit author for the corresponding AVFormatContext.max_interleave_delta
field.

avformat/movenc: Fix potential signed overflows

Fixes CID1302838

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

vp9: clamp final zero MV if find_ref_mvs() found no suitable candidates.

This may actually result in a non-zero MV. Fixes ticket 4583.

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

Merge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'

* commit '28fa58cf5d939151108345d7ddddebbd51d9b684':
  dxva2: Fix build when only D3D11 or DXVA2 is used

Conflicts:
libavcodec/dxva2_internal.h

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

Merge commit '31de41babcd96f8ac2e6632454737aecb3710df7'

* commit '31de41babcd96f8ac2e6632454737aecb3710df7':
  configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va

Conflicts:
configure

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

Merge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'

* commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63':
  h264: Fix HWACCEL_MAX for D3D11

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

Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'

* commit '674b79148ff29f40cbd569f5585bf99c71204bf5':
  hevc: Fix HWACCEL_MAX for D3D11

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

avutil/float_dsp: Fix ambiguous wording about vector products

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

avformat/mxfenc: Correct klv_fill_key

See SMPTE 377-1-2009 6.3.3 KLV Fill Items

Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'

* commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505':
  rtmpdh: Use GMP functions directly, instead of nettle wrappers

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

Merge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214'

* commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214':
  rtmpdh: Fix the indentation in a struct

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

dxva2: Fix build when only D3D11 or DXVA2 is used

Signed-off-by: Martin Storsjö <martin@martin.st>

configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va

Fixes build with some mingw-w64 versions, that have got the header
but not the interface declaration.

Signed-off-by: Martin Storsjö <martin@martin.st>

h264: Fix HWACCEL_MAX for D3D11

Signed-off-by: Martin Storsjö <martin@martin.st>

hevc: Fix HWACCEL_MAX for D3D11

Signed-off-by: Martin Storsjö <martin@martin.st>

rtmpdh: Use GMP functions directly, instead of nettle wrappers

mpz_import and mpz_export were added in GMP 4.1, in 2002.

This simplifies the DH code by clarifying that it only uses pure
bignum functions, no other parts of nettle/hogweed.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtmpdh: Fix the indentation in a struct

Signed-off-by: Martin Storsjö <martin@martin.st>

nvenc: remove cuda.h requirement for nvenc_a

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx()

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

avutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now support ppc64

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

avformat/utils: Simplify get_std_framerate() check

This also avoids using a floating point operation

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

Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'

* commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e':
  nvenc: H264 and HEVC encoders

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/version.h

This implementation is merged under the name nvenc_b*

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

avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation

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

Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'

* commit '522d971c7f5921bebcea2fc50e67056afdabb951':
  xsub: Check memory allocation

Conflicts:
libavcodec/xsubdec.c

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

Merge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1'

* commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1':
  wma: Check memory allocation

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

Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'

* commit 'e1ea365f7e1477c78865b866a180712174536c20':
  truemotion2: Check memory allocation

Conflicts:
libavcodec/truemotion2.c

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

Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'

* commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab':
  svq1: Check memory allocation

Conflicts:
libavcodec/svq1enc.c

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

Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'

* commit '42df71d9bbb1a5b4bce0bb34417692565c72d390':
  ratecontrol: Check memory allocation

Conflicts:
libavcodec/ratecontrol.c

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

Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'

* commit '0994e142132200c706f704271b5a7ae81d128f5c':
  pthread: Check memory allocation

Conflicts:
libavcodec/pthread_frame.c

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

Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'

* commit '03927cb73399e6f07185fc7f8851d7612b4187b6':
  psymodel: Check memory allocation

Conflicts:
libavcodec/psymodel.c

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

Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'

* commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91':
  xvid: Check memory allocation

See: 5c95de150f3b18f2e76fed670d6ea579feab1206 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e'

* commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e':
  x264: Check memory allocation

See: 066dc0437368acd21546ee327a0a94c60c3808b2 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'

* commit '41658bc88553dab8499e4dfca311559dcbae2674':
  libtheora: Check memory allocation

Conflicts:
libavcodec/libtheoraenc.c

See: 67d4d5f5db060fece8cc8e925f18f0a1c48813c6
See: 27216bf314c62125c408be1a5a79e5c9dba88e76
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'

* commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47':
  lcl: Check memory allocation

Conflicts:
libavcodec/lclenc.c

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

Merge commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02'

* commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02':
  jpegls: Check memory allocation

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

Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'

* commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9':
  huffyuv: Check memory allocation

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

Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'

* commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8':
  eatgv: Check memory allocation

Conflicts:
libavcodec/eatgv.c

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

Merge commit '69277069dd225f5ae02f0215e877a06522d834d3'

* commit '69277069dd225f5ae02f0215e877a06522d834d3':
  dct: Check memory allocation

Conflicts:
libavcodec/dct.c

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

Merge commit 'e524f37356156893cae50fc46451bd4a6198703d'

* commit 'e524f37356156893cae50fc46451bd4a6198703d':
  asv: Check memory allocation

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

avcodec/aacpsy: Clear the correct pointer

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

Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'

* commit '074a1b37325bf6d1483fc23ebf1255e78d998339':
  aacpsy: Check memory allocation

Conflicts:
libavcodec/aacpsy.c

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

Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'

* commit '149fa0b7ac180fe1df48a2e379c560813555bf57':
  mpegvideo: Move MotionEstContext and function declarations to a separate header

Conflicts:
libavcodec/mpegvideo.h

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

Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'

* commit 'b2b766914a49c4e3537df3a585e97b98d432edd2':
  mpegvideo: mpeg12: Move function declarations

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

Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'

* commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61':
  mpegvideo: Move tables to a separate file

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

Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'

* commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332':
  mpegvideo: msmpeg4: Move function declarations

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

Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'

* commit '2f15846ad7ad57beb0bca99c624affa0facf284b':
  mpegvideo: wmv2: Move function declarations

Conflicts:
libavcodec/wmv2.h

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

Merge commit '902a55f7161ffea10e13c1e7df14022e2ed90514'

* commit '902a55f7161ffea10e13c1e7df14022e2ed90514':
  dxva2_hevc: re-write reference frame handling

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

Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a'

* commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a':
  dxva2_hevc: fix 32x32 scaling lists

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

Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d'

* commit '5c720657c23afd798ae0db7c7362eb859a89ab3d':
  mov: always check avio_read return value

Conflicts:
libavformat/mov.c

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

Merge commit 'bff0349d9da527084e1433167466d8afc9e25c7f'

* commit 'bff0349d9da527084e1433167466d8afc9e25c7f':
  avio: Add avio_read wrapper to simplify error checking

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

Merge commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b'

* commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b':
  mov: reject zero bytes_per_frame with non-zero samples_per_frame

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

Merge commit '8e9c39e81fe5ba34010a7ba05cbe4ae31f177d89'

* commit '8e9c39e81fe5ba34010a7ba05cbe4ae31f177d89':
  mov: abort on EOF in ff_mov_read_chan

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

Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'

* commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c':
  mov: Correctly allocate ctts_data

Conflicts:
libavformat/mov.c

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

Merge commit 'f261a55d72753bcec33369954809732abae8f8f7'

* commit 'f261a55d72753bcec33369954809732abae8f8f7':
  mov: Fix two memleaks

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

Merge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'

* commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c':
  vp9: Parse subsampling and report missing feature

Conflicts:
libavcodec/vp9.c
libavcodec/vp9.h

No change as FFmpeg already supports subsampling

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

Merge commit 'd68c05380cebf563915412182643a8be04ef890b'

* commit 'd68c05380cebf563915412182643a8be04ef890b':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

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

x86: check for AV_CPU_FLAG_AVXSLOW where useful

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4'

* commit 'cae39851201b7781f1262e1c23627b45e6e80bb4':
  x86: Add helper macros to check for slow cpuflags

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

Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'

* commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
doc/APIchanges
libavutil/version.h

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

Merge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078'

* commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078':
  ppc: vsx: Implement diff_pixels and get_pixels

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

avutil/ppc/float_dsp_init: Disable duplicate functions

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

Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'

* commit 'eecd29b3fd7fee221580798346d6582b75c7ade4':
  ppc: vsx: Implement float_dsp

Conflicts:
libavutil/ppc/float_dsp_init.c

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

configure: ldbrx seems not working on qemu power8, disable for now

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

Merge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331'

* commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331':
  ppc: cpu: Add support for VSX and POWER8 extensions

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

Merge commit 'da60b99a8857d5ca236f32c1799a066e0135a866'

* commit 'da60b99a8857d5ca236f32c1799a066e0135a866':
  ppc: Restrict some Altivec implementations to Big Endian

Conflicts:
libavcodec/ppc/huffyuvdsp_altivec.c
libavcodec/ppc/me_cmp.c

Not merged, our PPC64LE fate clients passed all tests last time they did run

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

Merge commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b'

* commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b':
  ppc: configure: Support ISA 2.06 and later

Conflicts:
configure

See: ab12373956e92b865bced9b05b12971f062cfd3e and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>