ffmpeg.git
4 years agoavformat/movenc: Fix potential signed overflows
Michael Niedermayer [Mon, 1 Jun 2015 15:54:58 +0000 (17:54 +0200)]
avformat/movenc: Fix potential signed overflows

Fixes CID1302838

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: clamp final zero MV if find_ref_mvs() found no suitable candidates.
Ronald S. Bultje [Mon, 1 Jun 2015 15:17:44 +0000 (11:17 -0400)]
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>
4 years agoMerge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'
Michael Niedermayer [Mon, 1 Jun 2015 15:13:01 +0000 (17:13 +0200)]
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>
4 years agoMerge commit '31de41babcd96f8ac2e6632454737aecb3710df7'
Michael Niedermayer [Mon, 1 Jun 2015 15:09:25 +0000 (17:09 +0200)]
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>
4 years agoMerge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'
Michael Niedermayer [Mon, 1 Jun 2015 15:01:12 +0000 (17:01 +0200)]
Merge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'

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

See: 1b236541a6b55da6ddc73fadd9a252c7e4bfb55f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'
Michael Niedermayer [Mon, 1 Jun 2015 15:00:24 +0000 (17:00 +0200)]
Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'

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

See: 688147cfe2d14bf24d185eb7299be01e511582ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/float_dsp: Fix ambiguous wording about vector products
Michael Niedermayer [Mon, 1 Jun 2015 14:22:27 +0000 (16:22 +0200)]
avutil/float_dsp: Fix ambiguous wording about vector products

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfenc: Correct klv_fill_key
Michael Niedermayer [Fri, 29 May 2015 21:53:52 +0000 (23:53 +0200)]
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>
4 years agoMerge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'
Michael Niedermayer [Mon, 1 Jun 2015 09:29:01 +0000 (11:29 +0200)]
Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214'
Michael Niedermayer [Mon, 1 Jun 2015 09:27:56 +0000 (11:27 +0200)]
Merge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2: Fix build when only D3D11 or DXVA2 is used
Steve Lhomme [Tue, 26 May 2015 06:45:44 +0000 (08:45 +0200)]
dxva2: Fix build when only D3D11 or DXVA2 is used

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Steve Lhomme [Tue, 26 May 2015 06:45:43 +0000 (08:45 +0200)]
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>
4 years agoh264: Fix HWACCEL_MAX for D3D11
Michael Niedermayer [Tue, 26 May 2015 06:45:42 +0000 (08:45 +0200)]
h264: Fix HWACCEL_MAX for D3D11

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agohevc: Fix HWACCEL_MAX for D3D11
Michael Niedermayer [Tue, 26 May 2015 06:45:41 +0000 (08:45 +0200)]
hevc: Fix HWACCEL_MAX for D3D11

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmpdh: Use GMP functions directly, instead of nettle wrappers
Martin Storsjö [Sun, 31 May 2015 20:46:56 +0000 (23:46 +0300)]
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>
4 years agortmpdh: Fix the indentation in a struct
Martin Storsjö [Sat, 30 May 2015 19:19:35 +0000 (22:19 +0300)]
rtmpdh: Fix the indentation in a struct

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agonvenc: remove cuda.h requirement for nvenc_a
James Almer [Mon, 1 Jun 2015 03:52:28 +0000 (00:52 -0300)]
nvenc: remove cuda.h requirement for nvenc_a

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx()
Michael Niedermayer [Mon, 1 Jun 2015 02:39:56 +0000 (04:39 +0200)]
avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now support ppc64
Michael Niedermayer [Mon, 1 Jun 2015 02:06:25 +0000 (04:06 +0200)]
avutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now support ppc64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Simplify get_std_framerate() check
Michael Niedermayer [Mon, 1 Jun 2015 02:05:04 +0000 (04:05 +0200)]
avformat/utils: Simplify get_std_framerate() check

This also avoids using a floating point operation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'
Michael Niedermayer [Mon, 1 Jun 2015 01:13:03 +0000 (03:13 +0200)]
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>
4 years agoavcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation
Michael Niedermayer [Mon, 1 Jun 2015 00:57:51 +0000 (02:57 +0200)]
avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '522d971c7f5921bebcea2fc50e67056afdabb951'
Michael Niedermayer [Mon, 1 Jun 2015 00:46:56 +0000 (02:46 +0200)]
Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'

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

Conflicts:
libavcodec/xsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1'
Michael Niedermayer [Mon, 1 Jun 2015 00:43:02 +0000 (02:43 +0200)]
Merge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1'

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

See: 8559a714155a7bc79d4802558f509e211379a8a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e1ea365f7e1477c78865b866a180712174536c20'
Michael Niedermayer [Mon, 1 Jun 2015 00:41:45 +0000 (02:41 +0200)]
Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'

* commit 'e1ea365f7e1477c78865b866a180712174536c20':
  truemotion2: Check memory allocation

Conflicts:
libavcodec/truemotion2.c

See: d49f2603bedb780a6cedff4ac790605679cf4029
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'
Michael Niedermayer [Mon, 1 Jun 2015 00:37:30 +0000 (02:37 +0200)]
Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'

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

Conflicts:
libavcodec/svq1enc.c

See: 2a3af77284412b56eb0085f4b97d9db5aa04a64f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'
Michael Niedermayer [Mon, 1 Jun 2015 00:26:03 +0000 (02:26 +0200)]
Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'

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

Conflicts:
libavcodec/ratecontrol.c

See: 0898a6d4e4b669704fce663f610aa43dd7483fe9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0994e142132200c706f704271b5a7ae81d128f5c'
Michael Niedermayer [Mon, 1 Jun 2015 00:25:04 +0000 (02:25 +0200)]
Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'

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

Conflicts:
libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'
Michael Niedermayer [Mon, 1 Jun 2015 00:23:32 +0000 (02:23 +0200)]
Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'

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

Conflicts:
libavcodec/psymodel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'
Michael Niedermayer [Mon, 1 Jun 2015 00:12:26 +0000 (02:12 +0200)]
Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'

* commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91':
  xvid: Check memory allocation

See: 5c95de150f3b18f2e76fed670d6ea579feab1206 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e'
Michael Niedermayer [Mon, 1 Jun 2015 00:11:01 +0000 (02:11 +0200)]
Merge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e'

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

See: 066dc0437368acd21546ee327a0a94c60c3808b2 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '41658bc88553dab8499e4dfca311559dcbae2674'
Michael Niedermayer [Mon, 1 Jun 2015 00:10:30 +0000 (02:10 +0200)]
Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'

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

Conflicts:
libavcodec/libtheoraenc.c

See: 67d4d5f5db060fece8cc8e925f18f0a1c48813c6
See: 27216bf314c62125c408be1a5a79e5c9dba88e76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'
Michael Niedermayer [Sun, 31 May 2015 23:59:52 +0000 (01:59 +0200)]
Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'

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

Conflicts:
libavcodec/lclenc.c

See: 6dbcecd78e022493866fe39e30743284acc550b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02'
Michael Niedermayer [Sun, 31 May 2015 23:58:05 +0000 (01:58 +0200)]
Merge commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'
Michael Niedermayer [Sun, 31 May 2015 23:52:01 +0000 (01:52 +0200)]
Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9'

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

See: 4a722a5cab15d5aefbf4dd83baa8be5a046580ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'
Michael Niedermayer [Sun, 31 May 2015 23:44:44 +0000 (01:44 +0200)]
Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8'

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

Conflicts:
libavcodec/eatgv.c

See: a5615b82eb116e9fd0f71f2b03c333cc31ab706a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '69277069dd225f5ae02f0215e877a06522d834d3'
Michael Niedermayer [Sun, 31 May 2015 23:42:13 +0000 (01:42 +0200)]
Merge commit '69277069dd225f5ae02f0215e877a06522d834d3'

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

Conflicts:
libavcodec/dct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e524f37356156893cae50fc46451bd4a6198703d'
Michael Niedermayer [Sun, 31 May 2015 23:41:02 +0000 (01:41 +0200)]
Merge commit 'e524f37356156893cae50fc46451bd4a6198703d'

* commit 'e524f37356156893cae50fc46451bd4a6198703d':
  asv: Check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacpsy: Clear the correct pointer
Michael Niedermayer [Sun, 31 May 2015 23:32:24 +0000 (01:32 +0200)]
avcodec/aacpsy: Clear the correct pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'
Michael Niedermayer [Sun, 31 May 2015 23:32:12 +0000 (01:32 +0200)]
Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'

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

Conflicts:
libavcodec/aacpsy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'
Michael Niedermayer [Sun, 31 May 2015 23:30:01 +0000 (01:30 +0200)]
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>
5 years agoMerge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'
Michael Niedermayer [Sun, 31 May 2015 23:26:56 +0000 (01:26 +0200)]
Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'
Michael Niedermayer [Sun, 31 May 2015 23:17:40 +0000 (01:17 +0200)]
Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'
Michael Niedermayer [Sun, 31 May 2015 23:17:03 +0000 (01:17 +0200)]
Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'
Michael Niedermayer [Sun, 31 May 2015 23:09:38 +0000 (01:09 +0200)]
Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'

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

Conflicts:
libavcodec/wmv2.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '902a55f7161ffea10e13c1e7df14022e2ed90514'
Michael Niedermayer [Sun, 31 May 2015 23:08:14 +0000 (01:08 +0200)]
Merge commit '902a55f7161ffea10e13c1e7df14022e2ed90514'

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

See: 902a55f7161ffea10e13c1e7df14022e2ed90514
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a'
Michael Niedermayer [Sun, 31 May 2015 23:07:35 +0000 (01:07 +0200)]
Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a'

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

See: b7a0b303d982eebd61ff07389bdef3f8b04c2c65
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d'
Michael Niedermayer [Sun, 31 May 2015 22:57:07 +0000 (00:57 +0200)]
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>
5 years agoMerge commit 'bff0349d9da527084e1433167466d8afc9e25c7f'
Michael Niedermayer [Sun, 31 May 2015 22:43:47 +0000 (00:43 +0200)]
Merge commit 'bff0349d9da527084e1433167466d8afc9e25c7f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b'
Michael Niedermayer [Sun, 31 May 2015 22:36:36 +0000 (00:36 +0200)]
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>
5 years agoMerge commit '8e9c39e81fe5ba34010a7ba05cbe4ae31f177d89'
Michael Niedermayer [Sun, 31 May 2015 22:35:56 +0000 (00:35 +0200)]
Merge commit '8e9c39e81fe5ba34010a7ba05cbe4ae31f177d89'

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

See: a5718863da99b54b6c853d45c84871c4a96a57c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'
Michael Niedermayer [Sun, 31 May 2015 22:35:39 +0000 (00:35 +0200)]
Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c'

* commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c':
  mov: Correctly allocate ctts_data

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f261a55d72753bcec33369954809732abae8f8f7'
Michael Niedermayer [Sun, 31 May 2015 22:25:30 +0000 (00:25 +0200)]
Merge commit 'f261a55d72753bcec33369954809732abae8f8f7'

* commit 'f261a55d72753bcec33369954809732abae8f8f7':
  mov: Fix two memleaks

See: 8e77f8ab4abc199a5cc9d6c2c206b73fc2921af0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'
Michael Niedermayer [Sun, 31 May 2015 22:24:45 +0000 (00:24 +0200)]
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>
5 years agoMerge commit 'd68c05380cebf563915412182643a8be04ef890b'
Michael Niedermayer [Sun, 31 May 2015 22:22:23 +0000 (00:22 +0200)]
Merge commit 'd68c05380cebf563915412182643a8be04ef890b'

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

See: c16e99e3b3c02edcf33245468731d414eab97dac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: check for AV_CPU_FLAG_AVXSLOW where useful
James Almer [Sun, 31 May 2015 17:20:29 +0000 (14:20 -0300)]
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>
5 years agoMerge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4'
Michael Niedermayer [Sun, 31 May 2015 21:59:18 +0000 (23:59 +0200)]
Merge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872'
Michael Niedermayer [Sun, 31 May 2015 21:57:50 +0000 (23:57 +0200)]
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>
5 years agoMerge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078'
Michael Niedermayer [Sun, 31 May 2015 21:43:18 +0000 (23:43 +0200)]
Merge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/ppc/float_dsp_init: Disable duplicate functions
Michael Niedermayer [Sun, 31 May 2015 21:31:06 +0000 (23:31 +0200)]
avutil/ppc/float_dsp_init: Disable duplicate functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'
Michael Niedermayer [Sun, 31 May 2015 21:23:58 +0000 (23:23 +0200)]
Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'

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

Conflicts:
libavutil/ppc/float_dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: ldbrx seems not working on qemu power8, disable for now
Michael Niedermayer [Sun, 31 May 2015 21:12:57 +0000 (23:12 +0200)]
configure: ldbrx seems not working on qemu power8, disable for now

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331'
Michael Niedermayer [Sun, 31 May 2015 20:47:29 +0000 (22:47 +0200)]
Merge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'da60b99a8857d5ca236f32c1799a066e0135a866'
Michael Niedermayer [Sun, 31 May 2015 20:44:07 +0000 (22:44 +0200)]
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>
5 years agoMerge commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b'
Michael Niedermayer [Sun, 31 May 2015 20:22:16 +0000 (22:22 +0200)]
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>
5 years agoMerge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'
Michael Niedermayer [Sun, 31 May 2015 20:14:39 +0000 (22:14 +0200)]
Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'

* commit '3058872c293e239e3b51e86fe18cfbe720aadff1':
  ppc: Clarify and extend the cpuid check

Conflicts:
libavutil/ppc/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/ppc/cpu: Check if unistd.h is available before including it
Michael Niedermayer [Sun, 31 May 2015 20:09:37 +0000 (22:09 +0200)]
avutil/ppc/cpu: Check if unistd.h is available before including it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'baa94563fede8959a638b0fa132dd2124acd93e8'
Michael Niedermayer [Sun, 31 May 2015 19:57:07 +0000 (21:57 +0200)]
Merge commit 'baa94563fede8959a638b0fa132dd2124acd93e8'

* commit 'baa94563fede8959a638b0fa132dd2124acd93e8':
  ppc: linux: Check altivec using the auxv

Conflicts:
libavutil/ppc/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7014b65995b1fe6188fb53447bf61b08e3963355'
Michael Niedermayer [Sun, 31 May 2015 19:48:06 +0000 (21:48 +0200)]
Merge commit '7014b65995b1fe6188fb53447bf61b08e3963355'

* commit '7014b65995b1fe6188fb53447bf61b08e3963355':
  ppc: pixblockdsp: Use the abriged vector types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '72cebae0d981dde144340cf51f3c323f01e215e5'
Michael Niedermayer [Sun, 31 May 2015 19:38:58 +0000 (21:38 +0200)]
Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'

* commit '72cebae0d981dde144340cf51f3c323f01e215e5':
  ppc: avutil: Use the abriged vector types

Conflicts:
libavutil/ppc/float_dsp_altivec.c
libavutil/ppc/util_altivec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'
Michael Niedermayer [Sun, 31 May 2015 19:17:53 +0000 (21:17 +0200)]
Merge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'

* commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be':
  ppc: avutil: Drop a potentially dangerous workaround

See: 9564375deeaf22f8e8eaa4fcbc33115d104f7138
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/libquvi: fix error handling
Gilles Chanteperdrix [Wed, 8 Apr 2015 17:16:36 +0000 (19:16 +0200)]
avformat/libquvi: fix error handling

avoid calling cleanup functions on uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agonvenc: H264 and HEVC encoders
Luca Barbato [Sat, 30 May 2015 14:40:13 +0000 (16:40 +0200)]
nvenc: H264 and HEVC encoders

Partially based on the work of Timo Rothenpieler <timo@rothenpieler.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoxsub: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:55:44 +0000 (14:55 +0200)]
xsub: Check memory allocation

5 years agowma: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:55:35 +0000 (14:55 +0200)]
wma: Check memory allocation

5 years agotruemotion2: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:55:27 +0000 (14:55 +0200)]
truemotion2: Check memory allocation

5 years agosvq1: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:55:19 +0000 (14:55 +0200)]
svq1: Check memory allocation

5 years agoratecontrol: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:55:12 +0000 (14:55 +0200)]
ratecontrol: Check memory allocation

5 years agopthread: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:55:06 +0000 (14:55 +0200)]
pthread: Check memory allocation

5 years agopsymodel: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:54:55 +0000 (14:54 +0200)]
psymodel: Check memory allocation

5 years agoxvid: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:54:48 +0000 (14:54 +0200)]
xvid: Check memory allocation

5 years agox264: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:54:39 +0000 (14:54 +0200)]
x264: Check memory allocation

5 years agolibtheora: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:54:29 +0000 (14:54 +0200)]
libtheora: Check memory allocation

5 years agolcl: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:54:21 +0000 (14:54 +0200)]
lcl: Check memory allocation

5 years agojpegls: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:54:11 +0000 (14:54 +0200)]
jpegls: Check memory allocation

5 years agohuffyuv: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:54:03 +0000 (14:54 +0200)]
huffyuv: Check memory allocation

5 years agoeatgv: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:53:51 +0000 (14:53 +0200)]
eatgv: Check memory allocation

5 years agodct: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:53:31 +0000 (14:53 +0200)]
dct: Check memory allocation

5 years agoasv: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:50:21 +0000 (14:50 +0200)]
asv: Check memory allocation

5 years agoaacpsy: Check memory allocation
Vittorio Giovara [Sun, 31 May 2015 12:45:54 +0000 (14:45 +0200)]
aacpsy: Check memory allocation

5 years agoavfilter/vf_mpdecimate: add comment about 8x8 SAD
Peter Cordes [Wed, 4 Mar 2015 07:35:36 +0000 (03:35 -0400)]
avfilter/vf_mpdecimate: add comment about 8x8 SAD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_mpdecimate: support more pixel formats, including GBRP
Peter Cordes [Wed, 4 Mar 2015 07:35:36 +0000 (03:35 -0400)]
avfilter/vf_mpdecimate: support more pixel formats, including GBRP

Add some planar formats we can handle without distorting the meaning of
hi and lo.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_mpdecimate: debug logging of threshold stats
Peter Cordes [Tue, 3 Mar 2015 02:57:30 +0000 (22:57 -0400)]
avfilter/vf_mpdecimate: debug logging of threshold stats

It's often really helpful to know why a frame wasn't decimated (lo or
hi), and how much you exceeded the threshold by, if you're trying to
tweak the thresholds to get what you want.

mpdecimate already prints a line per input frame with -v debug, this
just makes it longer.

Signed-off-by: Peter Cordes <peter@cordes.ca>
5 years agompegvideo: Move MotionEstContext and function declarations to a separate header
Vittorio Giovara [Fri, 29 May 2015 18:44:05 +0000 (19:44 +0100)]
mpegvideo: Move MotionEstContext and function declarations to a separate header

5 years agompegvideo: mpeg12: Move function declarations
Vittorio Giovara [Fri, 29 May 2015 18:44:04 +0000 (19:44 +0100)]
mpegvideo: mpeg12: Move function declarations

5 years agompegvideo: Move tables to a separate file
Vittorio Giovara [Fri, 29 May 2015 18:44:03 +0000 (19:44 +0100)]
mpegvideo: Move tables to a separate file

5 years agompegvideo: msmpeg4: Move function declarations
Vittorio Giovara [Fri, 29 May 2015 18:44:02 +0000 (19:44 +0100)]
mpegvideo: msmpeg4: Move function declarations

5 years agompegvideo: wmv2: Move function declarations
Vittorio Giovara [Fri, 29 May 2015 18:44:01 +0000 (19:44 +0100)]
mpegvideo: wmv2: Move function declarations

5 years agodxva2_hevc: re-write reference frame handling
Hendrik Leppkes [Thu, 28 May 2015 16:25:37 +0000 (18:25 +0200)]
dxva2_hevc: re-write reference frame handling

The old logic required an explicit clearing of the lists first and was
prone to overflow the DXVA2 struct in some circumstances.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agodxva2_hevc: fix 32x32 scaling lists
Hendrik Leppkes [Thu, 28 May 2015 16:25:36 +0000 (18:25 +0200)]
dxva2_hevc: fix 32x32 scaling lists

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