virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity
72,499 Commits 37 Branches 400 Tags 467 MiB
c16e99e3b3
Commit Graph

72499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Niedermayer
3f21cdd85b Merge commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b' 
* commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b':
  ppc: configure: Support ISA 2.06 and later

Conflicts:
	configure

See: ab12373956 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 22:41:04 +02:00
Michael Niedermayer
8dcbfb73d5 Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1' 
* commit '3058872c293e239e3b51e86fe18cfbe720aadff1':
  ppc: Clarify and extend the cpuid check

Conflicts:
	libavutil/ppc/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 22:14:39 +02:00
Michael Niedermayer
47cc1a2bf1 avutil/ppc/cpu: Check if unistd.h is available before including it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 22:11:40 +02:00
Michael Niedermayer
ff1995437f Merge commit 'baa94563fede8959a638b0fa132dd2124acd93e8' 
* commit 'baa94563fede8959a638b0fa132dd2124acd93e8':
  ppc: linux: Check altivec using the auxv

Conflicts:
	libavutil/ppc/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 21:57:07 +02:00
Michael Niedermayer
08f229d81e Merge commit '7014b65995b1fe6188fb53447bf61b08e3963355' 
* commit '7014b65995b1fe6188fb53447bf61b08e3963355':
  ppc: pixblockdsp: Use the abriged vector types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 21:48:16 +02:00
Michael Niedermayer
e8676c758a 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>
 2015-05-31 21:38:58 +02:00
Michael Niedermayer
876a663c66 Merge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be' 
* commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be':
  ppc: avutil: Drop a potentially dangerous workaround

See: 9564375dee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 21:21:21 +02:00
Gilles Chanteperdrix
d61386a690 avformat/libquvi: fix error handling 
avoid calling cleanup functions on uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 19:04:52 +02:00
Peter Cordes
3ad3529b56 avfilter/vf_mpdecimate: add comment about 8x8 SAD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 13:58:55 +02:00
Peter Cordes
6590acf0fd 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>
 2015-05-31 13:58:50 +02:00
Peter Cordes
50f112c915 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>
 2015-05-31 13:25:40 +02:00
Peter Cordes
fb1be6303d avfilter/vf_mpdecimate: pass the same AVClass context as use elsewhere to av_pixelutils_get_sad_fn() 
Signed-off-by: Peter Cordes <peter@cordes.ca>
 2015-05-31 12:55:23 +02:00
Clément Bœsch
b60c445965 tests: add some ASS/SSA/MKS remux and transcode tests 2015-05-31 12:10:59 +02:00
James Almer
cae3985120 x86: Add helper macros to check for slow cpuflags 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 12:07:11 +02:00
James Almer
f7cafb5d02 x86: add AV_CPU_FLAG_AVXSLOW flag 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 12:07:11 +02:00
Luca Barbato
d0bf20a4f2 ppc: vsx: Implement diff_pixels and get_pixels 
Use a macro to abstract the endianness.
 2015-05-31 12:07:11 +02:00
Luca Barbato
eecd29b3fd ppc: vsx: Implement float_dsp 2015-05-31 12:07:11 +02:00
Luca Barbato
7d07ee5a9b ppc: cpu: Add support for VSX and POWER8 extensions 2015-05-31 12:07:11 +02:00
Luca Barbato
da60b99a88 ppc: Restrict some Altivec implementations to Big Endian 
In Little Endian the vec_ld/vec_st operations work as
expected only for byte-vectors.
 2015-05-31 12:07:11 +02:00
Luca Barbato
f22ebd2555 ppc: configure: Support ISA 2.06 and later 
POWER 7 and POWER 8 support VSX and ldbrx.

POWER 8 supports additional extended VSX instructions introduced
with ISA 2.07.
 2015-05-31 12:07:10 +02:00
Luca Barbato
3058872c29 ppc: Clarify and extend the cpuid check 
Add POWER entries.
 2015-05-31 12:07:10 +02:00
Luca Barbato
baa94563fe ppc: linux: Check altivec using the auxv 
Should prevent trying to use altivec when it is disabled by the kernel.
 2015-05-31 12:07:10 +02:00
Luca Barbato
7014b65995 ppc: pixblockdsp: Use the abriged vector types 2015-05-31 12:07:10 +02:00
Luca Barbato
72cebae0d9 ppc: avutil: Use the abriged vector types 2015-05-31 12:07:10 +02:00
Luca Barbato
254eb5b6fa ppc: avutil: Drop a potentially dangerous workaround 
The compiler is free to optimize such expressions in any sort of way.
 2015-05-31 12:07:10 +02:00
Rodger Combs
c729021f45 configure: Check for SecItemImport for securetransport as well 
This fixes the default build on iOS; eventually I should come up with
a better solution for that platform.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 12:02:53 +02:00
Michael Niedermayer
168195f25a Merge commit '881b80b3294483696a21b21a69fa5eee30f33037' 
* commit '881b80b3294483696a21b21a69fa5eee30f33037':
  network: prevent SIGPIPE on OSX

See: c41e0aedf5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 11:53:00 +02:00
wm4
881b80b329 network: prevent SIGPIPE on OSX 
OSX does not know MSG_NOSIGNAL. BSD (which OSX is based on) has got
the socket option SO_NOSIGPIPE (even if modern BSDs also support
MSG_NOSIGNAL).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-31 10:10:16 +03:00
Michael Niedermayer
03637762d9 avfilter/vf_fade: Force alpha pixel format if alpha is set to 1 
Fixes Ticket4321

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 04:31:28 +02:00
Michael Niedermayer
11aa050a25 avcodec/parser: Print an error in case of reallocation fails in ff_combine_frame() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 02:59:06 +02:00
Michael Niedermayer
6f51674c91 postproc: Avoid floats in maxClipped computation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 01:40:12 +02:00
Michael Niedermayer
ebe919cce2 postproc/postprocess_template: Compute packedYScale and QPCorrecture without floats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-31 00:59:34 +02:00
wm4
c41e0aedf5 network: prevent SIGPIPE on OSX 
OSX does not know MSG_NOSIGNAL, and provides its own non-standard
mechanism instead. I guess Apple hates standards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 22:29:19 +02:00
Michael Niedermayer
e9d646f44c Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d' 
* commit '0181ae9af2de1526464d23209b82e6674d362f5d':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
	libavcodec/h264_slice.c

See: e8714f6f93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 21:33:00 +02:00
Michael Niedermayer
7d1cfbbc3e Merge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948' 
* commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948':
  msrle: Use FFABS to determine the frame size in msrle_decode_pal4

Conflicts:
	libavcodec/msrledec.c

See: f7e1367f58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 21:20:24 +02:00
Andreas Cadhalpun
3ef5702926 libopenjpegdec: check existence of image component data 
libopenjpeg can return images with components without data.

This fixes segmentation faults.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-30 20:58:55 +02:00
Michael Niedermayer
161d0ac721 doc/ffmpeg: Document xerror 
Previous version reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 19:32:05 +02:00
Michael Niedermayer
a3ec1d6abd avformat/movenc: Add loction/xyz support to allow copying data between mov files 
Fixes Ticket4337

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 16:44:05 +02:00
Luca Barbato
0181ae9af2 h264: Make sure reinit failures mark the context as not initialized 
Bug-Id: CVE-2015-3417
CC: libav-stable@libav.org
 2015-05-30 16:28:32 +02:00
Luca Barbato
5ecabd3c54 msrle: Use FFABS to determine the frame size in msrle_decode_pal4 
As done in msrle_decode_8_16_24_32.

Bug-Id: CVE-2015-3395
CC: libav-stable@libav.org
 2015-05-30 16:28:32 +02:00
Michael Niedermayer
08b7d19def avformat/mov: Also export loci altitude 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-30 15:28:31 +02:00