Michael Niedermayer
cdf6804056
Merge commit ' 35818b8aaf'
...
* commit '35818b8aaf ':
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 ' 5c720657c2'
...
* commit '5c720657c2 ':
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 ' bff0349d9d'
...
* commit 'bff0349d9d ':
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 ' cffb9ea81b'
...
* commit 'cffb9ea81b ':
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 ' 8e9c39e81f'
...
* commit '8e9c39e81f ':
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 ' a8a90906fb'
...
* commit 'a8a90906fb ':
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 ' f261a55d72'
...
* commit 'f261a55d72 ':
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 ' 3f38d4b816'
...
* commit '3f38d4b816 ':
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 ' d68c05380c'
...
* commit 'd68c05380c ':
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 ' cae3985120'
...
* commit 'cae3985120 ':
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 ' f7cafb5d02'
...
* commit 'f7cafb5d02 ':
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 ' d0bf20a4f2'
...
* commit 'd0bf20a4f2 ':
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 ' eecd29b3fd'
...
* commit 'eecd29b3fd ':
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 ' 7d07ee5a9b'
...
* commit '7d07ee5a9b ':
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 ' da60b99a88'
...
* commit 'da60b99a88 ':
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 ' f22ebd2555'
...
* commit 'f22ebd2555 ':
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 ' 3058872c29'
...
* commit '3058872c29 ':
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 ' baa94563fe'
...
* commit 'baa94563fe ':
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 ' 7014b65995'
...
* commit '7014b65995 ':
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 ' 72cebae0d9'
...
* commit '72cebae0d9 ':
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 ' 254eb5b6fa'
...
* commit '254eb5b6fa ':
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
Hendrik Leppkes
35818b8aaf
dxva2_hevc: fix 32x32 scaling lists
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:13 +02:00
Andreas Cadhalpun
5c720657c2
mov: always check avio_read return value
...
If avio_read fails, the buffer can contain uninitialized data.
This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings, and addresses a few memleaks.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:13 +02:00
Vittorio Giovara
bff0349d9d
avio: Add avio_read wrapper to simplify error checking
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:13 +02:00
Andreas Cadhalpun
cffb9ea81b
mov: reject zero bytes_per_frame with non-zero samples_per_frame
...
In this case the mov demuxer can return a large number of empty packets.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
8e9c39e81f
mov: abort on EOF in ff_mov_read_chan
...
Otherwise the loop can take a lot of time if num_descr is very large.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 13:05:12 +02:00
Luca Barbato
a8a90906fb
mov: Correctly allocate ctts_data
...
It can be reallocated.
CC: libav-stable@libav.org
2015-05-31 13:05:12 +02:00
Andreas Cadhalpun
f261a55d72
mov: Fix two memleaks
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2015-05-31 13:05:12 +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
Vittorio Giovara
3f38d4b816
vp9: Parse subsampling and report missing feature
2015-05-31 12:19:19 +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
d68c05380c
x86: check for AV_CPU_FLAG_AVXSLOW where useful
...
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
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