Clément Bœsch
ca619cdf54
Merge commit ' 221402c1c8'
...
* commit '221402c1c8 ':
pcx: check that the packet is large enough before reading the header
See 8cd1c0febe
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:55:06 +01:00
Clément Bœsch
2da66630dc
Merge commit ' 15ee419b7a'
...
* commit '15ee419b7a ':
pcx: properly pad the scanline
This commit is a noop, see d24de4596c
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:51:56 +01:00
Clément Bœsch
d707e667c5
Merge commit ' 409d1cd2c9'
...
* commit '409d1cd2c9 ':
cook: use the bytestream2 API for reading extradata
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:47:19 +01:00
Clément Bœsch
a0220d949f
Merge commit ' bba9d8bdfb'
...
* commit 'bba9d8bdfb ':
qpeg: fix an off by 1 error in the MV check
See dd3bfe3cc1
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:39:49 +01:00
Clément Bœsch
f09aa73b30
Merge commit ' 796dca027b'
...
* commit '796dca027b ':
alac: do not return success if nothing was decoded
See e11983bda0
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:36:37 +01:00
Clément Bœsch
1080b7162f
Merge commit ' f5d46d3322'
...
* commit 'f5d46d3322 ':
vmnc: check that subrectangles fit into their containing rectangles
See 6ba02602aa
This merge keeps our condition against w-i and h-j instead of bw and bh.
One may be more correct than the other, but I'm keeping our behaviour
here for safety reasons.
The style and formatting is merged.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:24:49 +01:00
Clément Bœsch
01e188762f
Merge commit ' 83b92a855e'
...
* commit '83b92a855e ':
golomb: Drop disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:41 +01:00
Clément Bœsch
a754fae4a7
Merge commit ' 014852e932'
...
* commit '014852e932 ':
simple_idct: arm: Drop disabled code variant
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:07 +01:00
Clément Bœsch
8695ce73ca
Merge commit ' e2b9993558'
...
* commit 'e2b9993558 ':
simple_idct: x86: Drop disabled IDCT implementation
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:11:11 +01:00
Clément Bœsch
ff66ba6feb
Merge commit ' 7effebde78'
...
* commit '7effebde78 ':
dvbsubdec: Remove disabled, near-duplicate debug code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:10:17 +01:00
Clément Bœsch
b2c5f5054b
Merge commit ' 93fed46a92'
...
* commit '93fed46a92 ':
timefilter: test: Drop some disabled debug cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:08:27 +01:00
Clément Bœsch
adef752f1b
Merge commit ' 0e285c2f90'
...
* commit '0e285c2f90 ':
mpegvideo: Kill some disabled code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:07:30 +01:00
Clément Bœsch
95a29b1a82
Merge commit ' f2f145f303'
...
* commit 'f2f145f303 ':
msmpeg4: Drop disabled debug cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:06:49 +01:00
Clément Bœsch
87cd8dc0b0
Merge commit ' be1db21ba8'
...
* commit 'be1db21ba8 ':
mathops: Drop disabled alternative mid_pred() implementation
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:05:13 +01:00
Clément Bœsch
56d63208d8
Merge commit ' be3363f664'
...
* commit 'be3363f664 ':
nsv: Drop disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:04:46 +01:00
Clément Bœsch
1a48a51bfc
Merge commit ' b53d8c3ccf'
...
* commit 'b53d8c3ccf ':
mjpegdec: Drop disabled code
The last chunk is replaced with a comment describing the structure.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:03:25 +01:00
Clément Bœsch
7a6514861e
Merge commit ' 34c22a9ca6'
...
* commit '34c22a9ca6 ':
faan(i)dct: Kill some disabled code
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:00:21 +01:00
Clément Bœsch
83706367e2
Merge commit ' a4b1b5aa28'
...
* commit 'a4b1b5aa28 ':
wc3movie: Drop unused cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:59:49 +01:00
Clément Bœsch
2f42aef3e4
Merge commit ' 17cb56b356'
...
* commit '17cb56b356 ':
ffv1: Remove broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:58:43 +01:00
Clément Bœsch
b6e88bf323
Merge commit ' b96f0ab3d2'
...
* commit 'b96f0ab3d2 ':
h264: Kill broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:56:19 +01:00
Clément Bœsch
842e7853c7
Merge commit ' 42c4c2d2a6'
...
* commit '42c4c2d2a6 ':
aac: Drop broken cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:54:44 +01:00
Clément Bœsch
92cd2c04b1
Merge commit ' 263efc095e'
...
* commit '263efc095e ':
jfdct: Kill broken cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:50:17 +01:00
Clément Bœsch
3eed90b1ed
Merge commit ' d9442d1303'
...
* commit 'd9442d1303 ':
rm: Drop broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:49:47 +01:00
Clément Bœsch
4ded6f9b31
Merge commit ' dab2034b86'
...
* commit 'dab2034b86 ':
roqvideoenc: Drop broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:49:15 +01:00
Clément Bœsch
8a403b00d1
Merge commit ' 562bec0e69'
...
* commit '562bec0e69 ':
pnm_parser: Drop broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:48:50 +01:00
Clément Bœsch
18cdef9ab7
Merge commit ' a972fc1c0a'
...
* commit 'a972fc1c0a ':
wma: Kill non-compiling disabled cruft
See 0755033f8a
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:42:55 +01:00
Clément Bœsch
8e950c9b42
Merge commit ' aa37d2bf45'
...
* commit 'aa37d2bf45 ':
swscale: Kill non-compiling disabled cruft
The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.
The SWS_X chunk is merged, with an additional cosmetic.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:40:03 +01:00
Clément Bœsch
efcba5a06a
Merge commit ' d5fda00efa'
...
* commit 'd5fda00efa ':
mpeg4videoenc: Kill non-compiling disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:48:07 +01:00
Clément Bœsch
3f04964671
Merge commit ' e4d5b55193'
...
* commit 'e4d5b55193 ':
rangecoder: Kill non-compiling disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:44:04 +01:00
Muhammad Faiz
de1308429a
swresample/x86/resample: extend resample_double to support avx and fma3
...
benchmark:
sse2 10.670s
avx 8.763s
fma3 8.380s
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-03-19 12:24:41 +07:00
Clément Bœsch
3d5c2169e4
Merge commit ' 00a0419c7f'
...
* commit '00a0419c7f ':
mathematics: Kill non-compiling disabled cruft
This commit is a noop, see 1e1513d01a
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 23:51:51 +01:00
Clément Bœsch
ea8efc9594
lavu/mathematics: split closing bracket out of ifdefery
2017-03-18 23:50:05 +01:00
Clément Bœsch
1e1513d01a
lavu/mathematics: document so-called "cruft"
2017-03-18 23:50:03 +01:00
Clément Bœsch
2c400ba7d1
Merge commit ' 5a667322f5'
...
* commit '5a667322f5 ':
vaapi_vc1: Remove redundant version check
This commit is a noop, see d07d01bcce
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:07:39 +01:00
Clément Bœsch
e788c50ce2
Merge commit ' 01d6f84f49'
...
* commit '01d6f84f49 ':
vaapi_vc1: Constify pointers
This commit is a noop, see 845c2c140b
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:07:01 +01:00
Clément Bœsch
a6a6ed54d8
Merge commit ' ee9061293e'
...
* commit 'ee9061293e ':
vaapi_mpeg2: Constify pointers
This commit is a noop, see 6bc2808c41
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:05:36 +01:00
Clément Bœsch
54d839e80a
Merge commit ' 03adfe9130'
...
* commit '03adfe9130 ':
vaapi_h264: Constify pointers
This commit is a noop, see d0897da924
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:03:10 +01:00
Clément Bœsch
77d590cd9c
Merge commit ' 121f34d5f0'
...
* commit '121f34d5f0 ':
hwcontext_vaapi: Try the first render node as the default DRM device
This commit is a noop, see 8d47d84075
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:02:10 +01:00
Clément Bœsch
bd37ffdbb2
Merge commit ' 6fc944e613'
...
* commit '6fc944e613 ':
Prepare for 12_alpha1 Release
This commit is a noop.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:01:22 +01:00
Clément Bœsch
55dae222a0
Merge commit ' f6d2fed811'
...
* commit 'f6d2fed811 ':
avconv: Make sure that inputless filtergraphs are configured
This commit is a noop. Related code is pretty different in ffmpeg, and
-filter_complex testsrc works.
See also af1761f7b5
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:00:06 +01:00
Clément Bœsch
e3b81d2d9b
Merge commit ' 602abe77b0'
...
* commit '602abe77b0 ':
avconv: Check the fifo allocation
This commit is a noop, see af1761f7b5
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:45:11 +01:00
Clément Bœsch
9821aa7d38
Merge commit ' f2143c57b6'
...
* commit 'f2143c57b6 ':
vp9: reindent after last commit
vp9: add frame threading
vp9: allocate 'b', 'block/uvblock' and 'eob/uveob' dynamically.
vp9: split last/cur_frame from the reference buffers.
This commit is a noop, we already have all these changes. Again, we will
need in the future to analyse the tiny differences between the two
repository on the vp9 files. But in the current state, it's a real pain
to do at every commit due to the huge differences (such as files split
and cosmetics).
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:38:52 +01:00
Clément Bœsch
39d2b48757
Merge commit ' 04763c6f87'
...
* commit '04763c6f87 ':
h264_direct: use the reference mask from the actual reference
This commit is a noop, see d8151a7e94
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:32:05 +01:00
Clément Bœsch
822f1a7913
Merge commit ' e9bfff1cc6'
...
* commit 'e9bfff1cc6 ':
lavc: free buffer_frame/pkt on avcodec_open2() failure
This commit is a noop, see 27adf9f9cd .
Only reordered to reduce diff.
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:27:56 +01:00
Clément Bœsch
53587ca482
Merge commit ' ec021d4844'
...
* commit 'ec021d4844 ':
buffer: fix av_buffer_pool_init2() documentation
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:22:30 +01:00
James Almer
824d4062a1
compat/atomics/gcc: use __typeof__ instead of typeof
...
The typeof keyword is apparently not available when using the -std=c99 option.
Fixes the use of C11 atomic functions with old GCC.
Reviewed-by: Muhammad Faiz <mfcc64@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-18 12:13:46 -03:00
Rostislav Pehlivanov
3796fb2692
lavfi: deprecate AVFilterGraph->resample_lavr_opts
...
Not used by anything at all since we don't auto insert lavr filters.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-03-18 07:37:35 +00:00
Muhammad Faiz
c52638cca2
swresample/swresample: do not use s32p internally by default when resampling
...
use fltp when doing s32 -> s32 resampling
because s32p has no simd optimization
benchmark:
old 17.913s
new 7.584s (use fma3)
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-03-18 13:57:03 +07:00
Carl Eugen Hoyos
9e6b269fea
lavc/avcodec: Constify AVBitStreamFilter* in AVBitStreamFilterContext struct.
...
Fixes a gcc warning:
libavcodec/bitstream_filter.c:71:20: warning: assignment discards 'const' qualifier from pointer target type
2017-03-17 23:46:47 +01:00
Vittorio Giovara
95a72aed76
mov: Drop extra format specifier in error message
2017-03-17 15:30:11 -04:00