generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
72,673 Commits 24 Branches 241 Tags 173 MiB
6fd15d6e90
Commit Graph

72673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Storsjö
63ce9fd23c 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>
 2015-06-01 10:38:54 +03:00
Martin Storsjö
84c5ff911f rtmpdh: Fix the indentation in a struct 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-06-01 10:38:54 +03:00
James Almer
f10497042f nvenc: remove cuda.h requirement for nvenc_a 
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-01 01:33:47 -03:00
Michael Niedermayer
a1957a4dc1 avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 04:39:56 +02:00
Michael Niedermayer
9806cca1eb avutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now support ppc64 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 04:31:38 +02:00
Michael Niedermayer
1e0c34fe71 avformat/utils: Simplify get_std_framerate() check 
This also avoids using a floating point operation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 04:31:37 +02:00
Michael Niedermayer
d8bbb99c51 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>
 2015-06-01 03:13:55 +02:00
Michael Niedermayer
d0d0913702 avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other implementation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:57:51 +02:00
Michael Niedermayer
211dcdca5c Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951' 
* commit '522d971c7f5921bebcea2fc50e67056afdabb951':
  xsub: Check memory allocation

Conflicts:
	libavcodec/xsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:46:56 +02:00
Michael Niedermayer
1dc58965fd Merge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1' 
* commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1':
  wma: Check memory allocation

See: 8559a71415
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:43:45 +02:00
Michael Niedermayer
07f606b4f0 Merge commit 'e1ea365f7e1477c78865b866a180712174536c20' 
* commit 'e1ea365f7e1477c78865b866a180712174536c20':
  truemotion2: Check memory allocation

Conflicts:
	libavcodec/truemotion2.c

See: d49f2603be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:42:29 +02:00
Michael Niedermayer
f24b7d7616 Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab' 
* commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab':
  svq1: Check memory allocation

Conflicts:
	libavcodec/svq1enc.c

See: 2a3af77284
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:38:06 +02:00
Michael Niedermayer
abee1972ef Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390' 
* commit '42df71d9bbb1a5b4bce0bb34417692565c72d390':
  ratecontrol: Check memory allocation

Conflicts:
	libavcodec/ratecontrol.c

See: 0898a6d4e4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:27:26 +02:00
Michael Niedermayer
6ed8341cb1 Merge commit '0994e142132200c706f704271b5a7ae81d128f5c' 
* commit '0994e142132200c706f704271b5a7ae81d128f5c':
  pthread: Check memory allocation

Conflicts:
	libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:25:04 +02:00
Michael Niedermayer
615e73ab4f Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6' 
* commit '03927cb73399e6f07185fc7f8851d7612b4187b6':
  psymodel: Check memory allocation

Conflicts:
	libavcodec/psymodel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:23:32 +02:00
Michael Niedermayer
1a903f0d1e Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91' 
* commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91':
  xvid: Check memory allocation

See: 5c95de150f and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:12:58 +02:00
Michael Niedermayer
8b94cee99b Merge commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e' 
* commit '9fb483fede7207c1f3965e5ae1ac0ee82e4d7a4e':
  x264: Check memory allocation

See: 066dc04373 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:11:48 +02:00
Michael Niedermayer
fb7b5dc0e6 Merge commit '41658bc88553dab8499e4dfca311559dcbae2674' 
* commit '41658bc88553dab8499e4dfca311559dcbae2674':
  libtheora: Check memory allocation

Conflicts:
	libavcodec/libtheoraenc.c

See: 67d4d5f5db
See: 27216bf314
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:10:47 +02:00
Michael Niedermayer
3377f6fd15 Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47' 
* commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47':
  lcl: Check memory allocation

Conflicts:
	libavcodec/lclenc.c

See: 6dbcecd78e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 02:00:29 +02:00
Michael Niedermayer
513673a84d Merge commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02' 
* commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02':
  jpegls: Check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:58:44 +02:00
Michael Niedermayer
73e150fff7 Merge commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9' 
* commit '7d2a6826912b629f17f3b0c5268e334fa123c4c9':
  huffyuv: Check memory allocation

See: 4a722a5cab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:57:29 +02:00
Michael Niedermayer
10531d48a0 Merge commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8' 
* commit '7fccc96dc3c0bb2fa2079cbf4e4cf1aff2db46c8':
  eatgv: Check memory allocation

Conflicts:
	libavcodec/eatgv.c

See: a5615b82eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:45:39 +02:00
Michael Niedermayer
3a8b16f78e Merge commit '69277069dd225f5ae02f0215e877a06522d834d3' 
* commit '69277069dd225f5ae02f0215e877a06522d834d3':
  dct: Check memory allocation

Conflicts:
	libavcodec/dct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:42:13 +02:00
Michael Niedermayer
7110b024a9 Merge commit 'e524f37356156893cae50fc46451bd4a6198703d' 
* commit 'e524f37356156893cae50fc46451bd4a6198703d':
  asv: Check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:41:21 +02:00
Michael Niedermayer
e7a65142b9 avcodec/aacpsy: Clear the correct pointer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:32:24 +02:00
Michael Niedermayer
63fdedc794 Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339' 
* commit '074a1b37325bf6d1483fc23ebf1255e78d998339':
  aacpsy: Check memory allocation

Conflicts:
	libavcodec/aacpsy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:32:12 +02:00
Michael Niedermayer
0f69f02eb7 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>
 2015-06-01 01:30:01 +02:00
Michael Niedermayer
0aba7192e1 Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2' 
* commit 'b2b766914a49c4e3537df3a585e97b98d432edd2':
  mpegvideo: mpeg12: Move function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:27:02 +02:00
Michael Niedermayer
fd116b8dfa Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61' 
* commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61':
  mpegvideo: Move tables to a separate file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:26:36 +02:00
Michael Niedermayer
eb5a308d0e Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332' 
* commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332':
  mpegvideo: msmpeg4: Move function declarations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:17:26 +02:00
Michael Niedermayer
f5ee10c16a Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b' 
* commit '2f15846ad7ad57beb0bca99c624affa0facf284b':
  mpegvideo: wmv2: Move function declarations

Conflicts:
	libavcodec/wmv2.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:09:38 +02:00
Michael Niedermayer
f9dcf1690c Merge commit '902a55f7161ffea10e13c1e7df14022e2ed90514' 
* commit '902a55f7161ffea10e13c1e7df14022e2ed90514':
  dxva2_hevc: re-write reference frame handling

See: 902a55f716
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:08:37 +02:00
Michael Niedermayer
cdf6804056 Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a' 
* commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a':
  dxva2_hevc: fix 32x32 scaling lists

See: b7a0b303d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 01:07:57 +02:00
Michael Niedermayer
9e1cdfb89b Merge commit '5c720657c23afd798ae0db7c7362eb859a89ab3d' 
* commit '5c720657c23afd798ae0db7c7362eb859a89ab3d':
  mov: always check avio_read return value

Conflicts:
	libavformat/mov.c

See: b71528d896
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:59:44 +02:00
Michael Niedermayer
ebab902a1c Merge commit 'bff0349d9da527084e1433167466d8afc9e25c7f' 
* commit 'bff0349d9da527084e1433167466d8afc9e25c7f':
  avio: Add avio_read wrapper to simplify error checking

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:43:50 +02:00
Michael Niedermayer
3bd43430f8 Merge commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b' 
* commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b':
  mov: reject zero bytes_per_frame with non-zero samples_per_frame

See: 83a04f8cc1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:37:06 +02:00
Michael Niedermayer
2bedd17b64 Merge commit '8e9c39e81fe5ba34010a7ba05cbe4ae31f177d89' 
* commit '8e9c39e81fe5ba34010a7ba05cbe4ae31f177d89':
  mov: abort on EOF in ff_mov_read_chan

See: a5718863da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:36:20 +02:00
Michael Niedermayer
348319f543 Merge commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c' 
* commit 'a8a90906fb0ad0f8d3c68a97f182528ee3b5198c':
  mov: Correctly allocate ctts_data

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:35:39 +02:00
Michael Niedermayer
c2876c0181 Merge commit 'f261a55d72753bcec33369954809732abae8f8f7' 
* commit 'f261a55d72753bcec33369954809732abae8f8f7':
  mov: Fix two memleaks

See: 8e77f8ab4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:26:52 +02:00
Michael Niedermayer
61e1287551 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>
 2015-06-01 00:24:45 +02:00
Michael Niedermayer
b66b1a103f Merge commit 'd68c05380cebf563915412182643a8be04ef890b' 
* commit 'd68c05380cebf563915412182643a8be04ef890b':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

See: c16e99e3b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:22:47 +02:00
James Almer
c16e99e3b3 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>
 2015-06-01 00:15:35 +02:00
Michael Niedermayer
16c430e8ef Merge commit 'cae39851201b7781f1262e1c23627b45e6e80bb4' 
* commit 'cae39851201b7781f1262e1c23627b45e6e80bb4':
  x86: Add helper macros to check for slow cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 23:59:48 +02:00
Michael Niedermayer
c140227a8b Merge commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872' 
* commit 'f7cafb5d02aa3f26c185f6f9851413ad77a73872':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
	doc/APIchanges
	libavutil/version.h

See: c312bfac4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 23:58:30 +02:00
Michael Niedermayer
1ff47770ca Merge commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078' 
* commit 'd0bf20a4f25ac5de021c860a0c8ad05638ee2078':
  ppc: vsx: Implement diff_pixels and get_pixels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 23:55:32 +02:00
Michael Niedermayer
1046b6b093 avutil/ppc/float_dsp_init: Disable duplicate functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 23:42:46 +02:00
Michael Niedermayer
da9a6f4a2b Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4' 
* commit 'eecd29b3fd7fee221580798346d6582b75c7ade4':
  ppc: vsx: Implement float_dsp

Conflicts:
	libavutil/ppc/float_dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 23:42:36 +02:00
Michael Niedermayer
1aff90504a configure: ldbrx seems not working on qemu power8, disable for now 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 23:12:57 +02:00
Michael Niedermayer
58a4204873 Merge commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331' 
* commit '7d07ee5a9bd170a06d26fd967cf8de5d3b1ce331':
  ppc: cpu: Add support for VSX and POWER8 extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 22:47:50 +02:00
Michael Niedermayer
902ce2a6c4 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>
 2015-05-31 22:44:07 +02:00