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
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
Luca Barbato
b08caa87c3
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>
2015-05-31 15:17:22 +02:00
Vittorio Giovara
522d971c7f
xsub: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
83797da6e3
wma: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
e1ea365f7e
truemotion2: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
28fb80dcbf
svq1: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
42df71d9bb
ratecontrol: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
0994e14213
pthread: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
03927cb733
psymodel: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
fef2f4722b
xvid: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
9fb483fede
x264: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
41658bc885
libtheora: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
8df5fbf0b0
lcl: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
7ca603f96f
jpegls: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
7d2a682691
huffyuv: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
7fccc96dc3
eatgv: Check memory allocation
2015-05-31 15:03:31 +02:00
Vittorio Giovara
69277069dd
dct: Check memory allocation
2015-05-31 15:03:30 +02:00
Vittorio Giovara
e524f37356
asv: Check memory allocation
2015-05-31 15:03:30 +02:00
Vittorio Giovara
074a1b3732
aacpsy: Check memory allocation
2015-05-31 15:03:30 +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
Vittorio Giovara
149fa0b7ac
mpegvideo: Move MotionEstContext and function declarations to a separate header
2015-05-31 13:06:19 +02:00
Vittorio Giovara
b2b766914a
mpegvideo: mpeg12: Move function declarations
2015-05-31 13:06:19 +02:00
Vittorio Giovara
378a00087f
mpegvideo: Move tables to a separate file
2015-05-31 13:06:19 +02:00
Vittorio Giovara
31a117a0e6
mpegvideo: msmpeg4: Move function declarations
2015-05-31 13:06:19 +02:00