ffmpeg.git
2 years agoswscale: remove unused is{RGB,BGR}inBytes
Clément Bœsch [Sun, 19 Mar 2017 22:36:29 +0000 (23:36 +0100)]
swscale: remove unused is{RGB,BGR}inBytes

2 years agoswscale: use a (more correct) function for isPacked
Clément Bœsch [Sun, 19 Mar 2017 14:28:19 +0000 (15:28 +0100)]
swscale: use a (more correct) function for isPacked

2 years agoswscale: use a function for isAnyRGB
Clément Bœsch [Sun, 19 Mar 2017 14:15:10 +0000 (15:15 +0100)]
swscale: use a function for isAnyRGB

2 years agoswscale: use a function for isBayer
Clément Bœsch [Sun, 19 Mar 2017 14:04:53 +0000 (15:04 +0100)]
swscale: use a function for isBayer

2 years agolavu: add AV_PIX_FMT_FLAG_BAYER
Clément Bœsch [Sun, 19 Mar 2017 21:34:31 +0000 (22:34 +0100)]
lavu: add AV_PIX_FMT_FLAG_BAYER

2 years agoswscale: use a function for isGray
Clément Bœsch [Sun, 19 Mar 2017 13:57:29 +0000 (14:57 +0100)]
swscale: use a function for isGray

2 years agofate: add fate-sws-pixdesc-query
Clément Bœsch [Sun, 19 Mar 2017 13:48:32 +0000 (14:48 +0100)]
fate: add fate-sws-pixdesc-query

Test the pixel format querying within libswscale.

2 years agoavcodec/mjpegdec: quant_matrixes can be up to 65535, use uint16_t
Michael Niedermayer [Fri, 17 Mar 2017 02:25:18 +0000 (03:25 +0100)]
avcodec/mjpegdec: quant_matrixes can be up to 65535, use uint16_t

Fixes invalid shift
Fixes: 870/clusterfuzz-testcase-5649105424482304

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegdec: Check quant_matrixes values for being non zero
Michael Niedermayer [Fri, 17 Mar 2017 02:25:17 +0000 (03:25 +0100)]
avcodec/mjpegdec: Check quant_matrixes values for being non zero

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/vp56: Check avctx->error_concealment before enabling EC
Michael Niedermayer [Thu, 16 Mar 2017 10:20:46 +0000 (11:20 +0100)]
avcodec/vp56: Check avctx->error_concealment before enabling EC

Fixes timeout with 847/clusterfuzz-testcase-5291877358108672
Fixes timeout with 850/clusterfuzz-testcase-5721296509861888

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/h264_direct: Fix runtime error: signed integer overflow: -9 - 2147483647...
Michael Niedermayer [Thu, 16 Mar 2017 02:02:50 +0000 (03:02 +0100)]
avcodec/h264_direct: Fix runtime error: signed integer overflow: -9 - 2147483647 cannot be represented in type 'int'

Fixes: 864/clusterfuzz-testcase-4774385942528000

See: [FFmpeg-devel] [PATCH 1/2] avcodec/h264_direct: Fix runtime error: signed integer overflow: 2147483647 - -14133 cannot be represented in type 'int'
See: [FFmpeg-devel] [PATCH 2/2] avcodec/h264_direct: Fix runtime error: signed integer overflow: -9 - 2147483647 cannot be represented in type 'int'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/tiff: Check stripsize strippos for overflow
Michael Niedermayer [Thu, 16 Mar 2017 01:00:17 +0000 (02:00 +0100)]
avcodec/tiff: Check stripsize strippos for overflow

Fixes: 861/clusterfuzz-testcase-5688284384591872

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoaarch64: vp9itxfm16: Do a simpler half/quarter idct16/idct32 when possible
Martin Storsjö [Sat, 25 Feb 2017 22:38:48 +0000 (00:38 +0200)]
aarch64: vp9itxfm16: Do a simpler half/quarter idct16/idct32 when possible

This work is sponsored by, and copyright, Google.

This avoids loading and calculating coefficients that we know will
be zero, and avoids filling the temp buffer with zeros in places
where we know the second pass won't read.

This gives a pretty substantial speedup for the smaller subpartitions.

The code size increases from 21512 bytes to 31400 bytes.

The idct16/32_end macros are moved above the individual functions; the
instructions themselves are unchanged, but since new functions are added
at the same place where the code is moved from, the diff looks rather
messy.

Before:
vp9_inv_dct_dct_16x16_sub1_add_10_neon:     284.6
vp9_inv_dct_dct_16x16_sub2_add_10_neon:    1902.7
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    1903.0
vp9_inv_dct_dct_16x16_sub8_add_10_neon:    2201.1
vp9_inv_dct_dct_16x16_sub12_add_10_neon:   2510.0
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   2821.3
vp9_inv_dct_dct_32x32_sub1_add_10_neon:    1011.6
vp9_inv_dct_dct_32x32_sub2_add_10_neon:    9716.5
vp9_inv_dct_dct_32x32_sub4_add_10_neon:    9704.9
vp9_inv_dct_dct_32x32_sub8_add_10_neon:   10641.7
vp9_inv_dct_dct_32x32_sub12_add_10_neon:  11555.7
vp9_inv_dct_dct_32x32_sub16_add_10_neon:  12499.8
vp9_inv_dct_dct_32x32_sub20_add_10_neon:  13403.7
vp9_inv_dct_dct_32x32_sub24_add_10_neon:  14335.8
vp9_inv_dct_dct_32x32_sub28_add_10_neon:  15253.6
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  16179.5

After:
vp9_inv_dct_dct_16x16_sub1_add_10_neon:     282.8
vp9_inv_dct_dct_16x16_sub2_add_10_neon:    1142.4
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    1139.0
vp9_inv_dct_dct_16x16_sub8_add_10_neon:    1772.9
vp9_inv_dct_dct_16x16_sub12_add_10_neon:   2515.2
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   2823.5
vp9_inv_dct_dct_32x32_sub1_add_10_neon:    1012.7
vp9_inv_dct_dct_32x32_sub2_add_10_neon:    6944.4
vp9_inv_dct_dct_32x32_sub4_add_10_neon:    6944.2
vp9_inv_dct_dct_32x32_sub8_add_10_neon:    7609.8
vp9_inv_dct_dct_32x32_sub12_add_10_neon:   9953.4
vp9_inv_dct_dct_32x32_sub16_add_10_neon:  10770.1
vp9_inv_dct_dct_32x32_sub20_add_10_neon:  13418.8
vp9_inv_dct_dct_32x32_sub24_add_10_neon:  14330.7
vp9_inv_dct_dct_32x32_sub28_add_10_neon:  15257.1
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  16190.6

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm: vp9itxfm16: Do a simpler half/quarter idct16/idct32 when possible
Martin Storsjö [Fri, 24 Feb 2017 15:39:00 +0000 (17:39 +0200)]
arm: vp9itxfm16: Do a simpler half/quarter idct16/idct32 when possible

This work is sponsored by, and copyright, Google.

This avoids loading and calculating coefficients that we know will
be zero, and avoids filling the temp buffer with zeros in places
where we know the second pass won't read.

This gives a pretty substantial speedup for the smaller subpartitions.

The code size increases from 14516 bytes to 22484 bytes.

The idct16/32_end macros are moved above the individual functions; the
instructions themselves are unchanged, but since new functions are added
at the same place where the code is moved from, the diff looks rather
messy.

Before:                                 Cortex A7       A8       A9      A53
vp9_inv_dct_dct_16x16_sub1_add_10_neon:     454.0    270.7    418.5    295.4
vp9_inv_dct_dct_16x16_sub2_add_10_neon:    3840.2   3244.8   3700.1   2337.9
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    4212.5   3575.4   3996.9   2571.6
vp9_inv_dct_dct_16x16_sub8_add_10_neon:    5174.4   4270.5   4615.5   3031.9
vp9_inv_dct_dct_16x16_sub12_add_10_neon:   5676.0   4908.5   5226.5   3491.3
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   6403.9   5589.0   5839.8   3948.5
vp9_inv_dct_dct_32x32_sub1_add_10_neon:    1710.7    944.7   1582.1   1045.4
vp9_inv_dct_dct_32x32_sub2_add_10_neon:   21040.7  16706.1  18687.7  13193.1
vp9_inv_dct_dct_32x32_sub4_add_10_neon:   22197.7  18282.7  19577.5  13918.6
vp9_inv_dct_dct_32x32_sub8_add_10_neon:   24511.5  20911.5  21472.5  15367.5
vp9_inv_dct_dct_32x32_sub12_add_10_neon:  26939.5  24264.3  23239.1  16830.3
vp9_inv_dct_dct_32x32_sub16_add_10_neon:  29419.5  26845.1  25020.6  18259.9
vp9_inv_dct_dct_32x32_sub20_add_10_neon:  31146.4  29633.5  26803.3  19721.7
vp9_inv_dct_dct_32x32_sub24_add_10_neon:  33376.3  32507.8  28642.4  21174.2
vp9_inv_dct_dct_32x32_sub28_add_10_neon:  35629.4  35439.6  30416.5  22625.7
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  37269.9  37914.9  32271.9  24078.9

After:
vp9_inv_dct_dct_16x16_sub1_add_10_neon:     454.0    276.0    418.5    295.1
vp9_inv_dct_dct_16x16_sub2_add_10_neon:    2336.2   1886.0   2251.0   1458.6
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    2531.0   2054.7   2402.8   1591.1
vp9_inv_dct_dct_16x16_sub8_add_10_neon:    3848.6   3491.1   3845.7   2554.8
vp9_inv_dct_dct_16x16_sub12_add_10_neon:   5703.8   4831.6   5230.8   3493.4
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   6399.5   5567.0   5832.4   3951.5
vp9_inv_dct_dct_32x32_sub1_add_10_neon:    1722.1    938.5   1577.3   1044.5
vp9_inv_dct_dct_32x32_sub2_add_10_neon:   15003.5  11576.8  13105.8   9602.2
vp9_inv_dct_dct_32x32_sub4_add_10_neon:   15768.5  12677.2  13726.0  10138.1
vp9_inv_dct_dct_32x32_sub8_add_10_neon:   17278.8  14825.4  14907.5  11185.7
vp9_inv_dct_dct_32x32_sub12_add_10_neon:  22335.7  21544.5  20379.5  15019.8
vp9_inv_dct_dct_32x32_sub16_add_10_neon:  24165.6  23881.7  21938.6  16308.2
vp9_inv_dct_dct_32x32_sub20_add_10_neon:  31082.2  30860.9  26835.3  19711.3
vp9_inv_dct_dct_32x32_sub24_add_10_neon:  33102.6  31922.8  28638.3  21161.0
vp9_inv_dct_dct_32x32_sub28_add_10_neon:  35104.9  34867.5  30411.7  22621.2
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  37438.1  39103.4  32217.8  24067.6

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoaarch64: vp9itxfm16: Move the load_add_store macro out from the itxfm16 pass2 function
Martin Storsjö [Fri, 24 Feb 2017 14:49:12 +0000 (16:49 +0200)]
aarch64: vp9itxfm16: Move the load_add_store macro out from the itxfm16 pass2 function

This allows reusing the macro for a separate implementation of the
pass2 function.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoaarch64: vp9itxfm16: Make the larger core transforms standalone functions
Martin Storsjö [Fri, 24 Feb 2017 14:10:25 +0000 (16:10 +0200)]
aarch64: vp9itxfm16: Make the larger core transforms standalone functions

This work is sponsored by, and copyright, Google.

This reduces the code size of libavcodec/aarch64/vp9itxfm_16bpp_neon.o from
26288 to 21512 bytes.

This gives a small slowdown of a couple of tens of cycles, but makes
it more feasible to add more optimized versions of these transforms.

Before:
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    1887.4
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   2801.5
vp9_inv_dct_dct_32x32_sub4_add_10_neon:    9691.4
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  16154.9

After:
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    1899.5
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   2827.2
vp9_inv_dct_dct_32x32_sub4_add_10_neon:    9714.7
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  16175.9

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm: vp9itxfm16: Make the larger core transforms standalone functions
Martin Storsjö [Fri, 24 Feb 2017 14:02:23 +0000 (16:02 +0200)]
arm: vp9itxfm16: Make the larger core transforms standalone functions

This work is sponsored by, and copyright, Google.

This reduces the code size of libavcodec/arm/vp9itxfm_16bpp_neon.o from
17500 to 14516 bytes.

This gives a small slowdown of a couple tens of cycles, up to around
150 cycles for the full case of the largest transform, but makes
it more feasible to add more optimized versions of these transforms.

Before:                                 Cortex A7       A8       A9      A53
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    4237.4   3561.5   3971.8   2525.3
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   6371.9   5452.0   5779.3   3910.5
vp9_inv_dct_dct_32x32_sub4_add_10_neon:   22068.8  17867.5  19555.2  13871.6
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  37268.9  38684.2  32314.2  23969.0

After:
vp9_inv_dct_dct_16x16_sub4_add_10_neon:    4375.1   3571.9   4283.8   2567.2
vp9_inv_dct_dct_16x16_sub16_add_10_neon:   6415.6   5578.9   5844.6   3948.3
vp9_inv_dct_dct_32x32_sub4_add_10_neon:   22653.7  18079.7  19603.7  13905.3
vp9_inv_dct_dct_32x32_sub32_add_10_neon:  37593.2  38862.2  32235.8  24070.9

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoaarch64: vp9itxfm16: Restructure the idct32 store macros
Martin Storsjö [Sun, 26 Feb 2017 11:43:10 +0000 (13:43 +0200)]
aarch64: vp9itxfm16: Restructure the idct32 store macros

This avoids concatenation, which can't be used if the whole macro
is wrapped within another macro.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoaarch64: vp9itxfm16: Avoid .irp when it doesn't save any lines
Martin Storsjö [Sat, 25 Feb 2017 22:28:12 +0000 (00:28 +0200)]
aarch64: vp9itxfm16: Avoid .irp when it doesn't save any lines

This makes the code a bit more readable.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoaarch64: vp9itxfm16: Fix a typo in a comment
Martin Storsjö [Sat, 25 Feb 2017 22:24:50 +0000 (00:24 +0200)]
aarch64: vp9itxfm16: Fix a typo in a comment

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm: vp9itxfm16: Avoid reloading the idct32 coefficients
Martin Storsjö [Fri, 24 Feb 2017 22:20:25 +0000 (00:20 +0200)]
arm: vp9itxfm16: Avoid reloading the idct32 coefficients

Keep the idct32 coefficients in narrow form in q6-q7, and idct16
coefficients in lengthened 32 bit form in q0-q3. Avoid clobbering
q0-q3 in the pass1 function, and squeeze the idct16 coefficients
into q0-q1 in the pass2 function to avoid reloading them.

The idct16 coefficients are clobbered and reloaded within idct32_odd
though, since that turns out to be faster than narrowing them and
swapping them into q6-q7.

Before:                            Cortex       A7        A8        A9      A53
vp9_inv_dct_dct_32x32_sub4_add_10_neon:    22653.8   18268.4   19598.0  14079.0
vp9_inv_dct_dct_32x32_sub32_add_10_neon:   37699.0   38665.2   32542.3  24472.2
After:
vp9_inv_dct_dct_32x32_sub4_add_10_neon:    22270.8   18159.3   19531.0  13865.0
vp9_inv_dct_dct_32x32_sub32_add_10_neon:   37523.3   37731.6   32181.7  24071.2

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm: vp9itxfm16: Fix vertical alignment
Martin Storsjö [Fri, 24 Feb 2017 22:07:22 +0000 (00:07 +0200)]
arm: vp9itxfm16: Fix vertical alignment

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm: vp9itxfm16: Use the right lane size
Martin Storsjö [Fri, 24 Feb 2017 15:36:05 +0000 (17:36 +0200)]
arm: vp9itxfm16: Use the right lane size

This makes the code slightly clearer, but doesn't make any functional
difference.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm/aarch64: vp9: Fix vertical alignment
Martin Storsjö [Sun, 8 Jan 2017 22:04:19 +0000 (00:04 +0200)]
arm/aarch64: vp9: Fix vertical alignment

Align the second/third operands as they usually are.

Due to the wildly varying sizes of the written out operands
in aarch64 assembly, the column alignment is usually not as clear
as in arm assembly.

This is cherrypicked from libav commit
7995ebfad12002033c73feed422a1cfc62081e8f.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm/aarch64: vp9itxfm: Skip loading the min_eob pointer when it won't be used
Martin Storsjö [Sun, 26 Feb 2017 20:13:10 +0000 (22:13 +0200)]
arm/aarch64: vp9itxfm: Skip loading the min_eob pointer when it won't be used

In the half/quarter cases where we don't use the min_eob array, defer
loading the pointer until we know it will be needed.

This is cherrypicked from libav commit
3a0d5e206d24d41d87a25ba16a79b2ea04c39d4c.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoarm: vp9itxfm: Template the quarter/half idct32 function
Martin Storsjö [Sun, 26 Feb 2017 12:02:35 +0000 (14:02 +0200)]
arm: vp9itxfm: Template the quarter/half idct32 function

This reduces the number of lines and reduces the duplication.

Also simplify the eob check for the half case.

If we are in the half case, we know we at least will need to do the
first three slices, we only need to check eob for the fourth one,
so we can hardcode the value to check against instead of loading
from the min_eob array.

Since at most one slice can be skipped in the first pass, we can
unroll the loop for filling zeros completely, as it was done for
the quarter case before.

This allows skipping loading the min_eob pointer when using the
quarter/half cases.

This is cherrypicked from libav commit
98ee855ae0cc118bd1d20921d6bdb14731832462.

Signed-off-by: Martin Storsjö <martin@martin.st>
2 years agoMerge commit '4ab496261b12e20ef293b7adca4fcaef1a67c538'
James Almer [Sun, 19 Mar 2017 20:24:32 +0000 (17:24 -0300)]
Merge commit '4ab496261b12e20ef293b7adca4fcaef1a67c538'

* commit '4ab496261b12e20ef293b7adca4fcaef1a67c538':
  libvpx: Cast a pointer to const to squelch a warning

This commit is a noop, see 09b3bbe6057c9d03dff2467b1e6748a617afea15

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '721d57e608dc4fd6c86f27c5ae76ef559d646220'
James Almer [Sun, 19 Mar 2017 18:36:37 +0000 (15:36 -0300)]
Merge commit '721d57e608dc4fd6c86f27c5ae76ef559d646220'

* commit '721d57e608dc4fd6c86f27c5ae76ef559d646220':
  vp56: Separate VP5 and VP6 dsp initialization

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3fd22538bc0e0de84b31335266b4b1577d3d609e'
James Almer [Sun, 19 Mar 2017 18:30:13 +0000 (15:30 -0300)]
Merge commit '3fd22538bc0e0de84b31335266b4b1577d3d609e'

* commit '3fd22538bc0e0de84b31335266b4b1577d3d609e':
  prores: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f81be06cf614919d71ded29b8f595bef40123ad8'
James Almer [Sun, 19 Mar 2017 18:23:52 +0000 (15:23 -0300)]
Merge commit 'f81be06cf614919d71ded29b8f595bef40123ad8'

* commit 'f81be06cf614919d71ded29b8f595bef40123ad8':
  cavs: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '802727b538b484e3f9d1345bfcc4ab24cfea8898'
James Almer [Sun, 19 Mar 2017 18:18:31 +0000 (15:18 -0300)]
Merge commit '802727b538b484e3f9d1345bfcc4ab24cfea8898'

* commit '802727b538b484e3f9d1345bfcc4ab24cfea8898':
  vp8: Update some assembly comments left unchanged in bd66f073fe7286bd3c

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '87c6c78604e4dd16f1f45862b27ca006da010527'
James Almer [Sun, 19 Mar 2017 18:10:28 +0000 (15:10 -0300)]
Merge commit '87c6c78604e4dd16f1f45862b27ca006da010527'

* commit '87c6c78604e4dd16f1f45862b27ca006da010527':
  vp8: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd9d26a3674f31f482f54e936fcb382160830877a'
James Almer [Sun, 19 Mar 2017 17:54:25 +0000 (14:54 -0300)]
Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'

* commit 'd9d26a3674f31f482f54e936fcb382160830877a':
  vp56: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '6892df9294d93322d43255ada299507465bc93c8'
Clément Bœsch [Sun, 19 Mar 2017 17:41:26 +0000 (18:41 +0100)]
Merge commit '6892df9294d93322d43255ada299507465bc93c8'

* commit '6892df9294d93322d43255ada299507465bc93c8':
  vp3: Change type of stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2'
Clément Bœsch [Sun, 19 Mar 2017 17:34:48 +0000 (18:34 +0100)]
Merge commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2'

* commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2':
  doc: Document FATE option HWACCEL

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'
Clément Bœsch [Sun, 19 Mar 2017 17:28:40 +0000 (18:28 +0100)]
Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'

* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
  av1: Add codec_id and basic demuxing support

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '24130234cd9dd733116d17b724ea4c8e12ce097a'
Clément Bœsch [Sun, 19 Mar 2017 17:22:53 +0000 (18:22 +0100)]
Merge commit '24130234cd9dd733116d17b724ea4c8e12ce097a'

* commit '24130234cd9dd733116d17b724ea4c8e12ce097a':
  rtpdec_mpeg4: validate fmtp fields

Merged with fixed log message.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '46e3936fb04d06550151e667357065e3f646da1a'
Clément Bœsch [Sun, 19 Mar 2017 17:21:56 +0000 (18:21 +0100)]
Merge commit '46e3936fb04d06550151e667357065e3f646da1a'

* commit '46e3936fb04d06550151e667357065e3f646da1a':
  configure: Set __MSVCRT_VERSION__to 0x0700 for MinGW

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '6755eb5b212384e0599f7f2c5de42df49fff57de'
Clément Bœsch [Sun, 19 Mar 2017 17:20:18 +0000 (18:20 +0100)]
Merge commit '6755eb5b212384e0599f7f2c5de42df49fff57de'

* commit '6755eb5b212384e0599f7f2c5de42df49fff57de':
  mss12: validate display dimensions

This commit is a noop, see ee9151b616fa7fa5e9b3258ecafd00c9f784baaa

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '33f10546ec012ad4e1054b57317885cded7e953e'
Clément Bœsch [Sun, 19 Mar 2017 17:18:02 +0000 (18:18 +0100)]
Merge commit '33f10546ec012ad4e1054b57317885cded7e953e'

* commit '33f10546ec012ad4e1054b57317885cded7e953e':
  vc1: check that slices have a positive height

This commit is a noop, see e985cfd18bc416d3ff0c83ccafdc1ac733e6d522

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '09b23786b3986502ee88d4907356979127169bdd'
Clément Bœsch [Sun, 19 Mar 2017 17:17:24 +0000 (18:17 +0100)]
Merge commit '09b23786b3986502ee88d4907356979127169bdd'

* commit '09b23786b3986502ee88d4907356979127169bdd':
  pcx: use the bytestream2 API for reading from input

This commit is a noop, see 8cd1c0febe88b757e915e9af15559575c21ca728

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '221402c1c88b9d12130c6f5834029b535ee0e0c5'
Clément Bœsch [Sun, 19 Mar 2017 16:54:08 +0000 (17:54 +0100)]
Merge commit '221402c1c88b9d12130c6f5834029b535ee0e0c5'

* commit '221402c1c88b9d12130c6f5834029b535ee0e0c5':
  pcx: check that the packet is large enough before reading the header

See 8cd1c0febe88b757e915e9af15559575c21ca728

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'
Clément Bœsch [Sun, 19 Mar 2017 16:51:56 +0000 (17:51 +0100)]
Merge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'

* commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b':
  pcx: properly pad the scanline

This commit is a noop, see d24de4596c3f980c9cc1cb5c8706c8411e46275b

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '409d1cd2c955485798f8b0b0147c2b899b9144ec'
Clément Bœsch [Sun, 19 Mar 2017 16:47:19 +0000 (17:47 +0100)]
Merge commit '409d1cd2c955485798f8b0b0147c2b899b9144ec'

* commit '409d1cd2c955485798f8b0b0147c2b899b9144ec':
  cook: use the bytestream2 API for reading extradata

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'
Clément Bœsch [Sun, 19 Mar 2017 16:39:49 +0000 (17:39 +0100)]
Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'

* commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b':
  qpeg: fix an off by 1 error in the MV check

See dd3bfe3cc1ca26d0fff3a3baf61a40207032143f

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'
Clément Bœsch [Sun, 19 Mar 2017 16:36:17 +0000 (17:36 +0100)]
Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'

* commit '796dca027be09334d7bbf4f2ac1200e06bb054cb':
  alac: do not return success if nothing was decoded

See e11983bda073f8c63f60509ee753da9fba20ed10

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'
Clément Bœsch [Sun, 19 Mar 2017 16:24:49 +0000 (17:24 +0100)]
Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'

* commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b':
  vmnc: check that subrectangles fit into their containing rectangles

See 6ba02602aa7fc7d38db582e75b8b093fb3c1608d

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>
2 years agoMerge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'
Clément Bœsch [Sun, 19 Mar 2017 15:12:41 +0000 (16:12 +0100)]
Merge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'

* commit '83b92a855e8e08bdec484e13ee5a7c8996224772':
  golomb: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'
Clément Bœsch [Sun, 19 Mar 2017 15:12:07 +0000 (16:12 +0100)]
Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'

* commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c':
  simple_idct: arm: Drop disabled code variant

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e2b9993558b6adee42dcc6eb385a14943aaca974'
Clément Bœsch [Sun, 19 Mar 2017 15:11:11 +0000 (16:11 +0100)]
Merge commit 'e2b9993558b6adee42dcc6eb385a14943aaca974'

* commit 'e2b9993558b6adee42dcc6eb385a14943aaca974':
  simple_idct: x86: Drop disabled IDCT implementation

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '7effebde78977fafce935776153ea2f7c0981fa3'
Clément Bœsch [Sun, 19 Mar 2017 15:10:17 +0000 (16:10 +0100)]
Merge commit '7effebde78977fafce935776153ea2f7c0981fa3'

* commit '7effebde78977fafce935776153ea2f7c0981fa3':
  dvbsubdec: Remove disabled, near-duplicate debug code

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'
Clément Bœsch [Sun, 19 Mar 2017 15:08:27 +0000 (16:08 +0100)]
Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'

* commit '93fed46a92bab8be176d3e67be4354189a8dbe7f':
  timefilter: test: Drop some disabled debug cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'
Clément Bœsch [Sun, 19 Mar 2017 15:07:30 +0000 (16:07 +0100)]
Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'

* commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65':
  mpegvideo: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'
Clément Bœsch [Sun, 19 Mar 2017 15:06:49 +0000 (16:06 +0100)]
Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'

* commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c':
  msmpeg4: Drop disabled debug cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'
Clément Bœsch [Sun, 19 Mar 2017 15:05:13 +0000 (16:05 +0100)]
Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'

* commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e':
  mathops: Drop disabled alternative mid_pred() implementation

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'be3363f664d7314d55b42860bd4077154752d769'
Clément Bœsch [Sun, 19 Mar 2017 15:04:46 +0000 (16:04 +0100)]
Merge commit 'be3363f664d7314d55b42860bd4077154752d769'

* commit 'be3363f664d7314d55b42860bd4077154752d769':
  nsv: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c'
Clément Bœsch [Sun, 19 Mar 2017 15:03:25 +0000 (16:03 +0100)]
Merge commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c'

* commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c':
  mjpegdec: Drop disabled code

The last chunk is replaced with a comment describing the structure.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '34c22a9ca656603428b2c3490d1339c5a5966961'
Clément Bœsch [Sun, 19 Mar 2017 15:00:21 +0000 (16:00 +0100)]
Merge commit '34c22a9ca656603428b2c3490d1339c5a5966961'

* commit '34c22a9ca656603428b2c3490d1339c5a5966961':
  faan(i)dct: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'
Clément Bœsch [Sun, 19 Mar 2017 14:59:49 +0000 (15:59 +0100)]
Merge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'

* commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0':
  wc3movie: Drop unused cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'
Clément Bœsch [Sun, 19 Mar 2017 14:58:43 +0000 (15:58 +0100)]
Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'

* commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710':
  ffv1: Remove broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'
Clément Bœsch [Sun, 19 Mar 2017 14:56:19 +0000 (15:56 +0100)]
Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'

* commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661':
  h264: Kill broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'
Clément Bœsch [Sun, 19 Mar 2017 14:54:44 +0000 (15:54 +0100)]
Merge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'

* commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e':
  aac: Drop broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '263efc095e6c7ec2902119118b084cea29ea8916'
Clément Bœsch [Sun, 19 Mar 2017 14:50:17 +0000 (15:50 +0100)]
Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'

* commit '263efc095e6c7ec2902119118b084cea29ea8916':
  jfdct: Kill broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'
Clément Bœsch [Sun, 19 Mar 2017 14:49:47 +0000 (15:49 +0100)]
Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'

* commit 'd9442d13033a24b14ebae149dcdb42709430e2d9':
  rm: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'
Clément Bœsch [Sun, 19 Mar 2017 14:49:15 +0000 (15:49 +0100)]
Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'

* commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358':
  roqvideoenc: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '562bec0e690760fb93deb2843a7237713103a191'
Clément Bœsch [Sun, 19 Mar 2017 14:48:50 +0000 (15:48 +0100)]
Merge commit '562bec0e690760fb93deb2843a7237713103a191'

* commit '562bec0e690760fb93deb2843a7237713103a191':
  pnm_parser: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c'
Clément Bœsch [Sun, 19 Mar 2017 14:42:31 +0000 (15:42 +0100)]
Merge commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c'

* commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c':
  wma: Kill non-compiling disabled cruft

See 0755033f8af774cea34566adec455fbafd9f66bc

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'
Clément Bœsch [Sun, 19 Mar 2017 14:37:07 +0000 (15:37 +0100)]
Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'

* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
  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>
2 years agoMerge commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf'
Clément Bœsch [Sun, 19 Mar 2017 12:48:07 +0000 (13:48 +0100)]
Merge commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf'

* commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf':
  mpeg4videoenc: Kill non-compiling disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e4d5b55193109d08be47c42d320334546c006b51'
Clément Bœsch [Sun, 19 Mar 2017 12:44:04 +0000 (13:44 +0100)]
Merge commit 'e4d5b55193109d08be47c42d320334546c006b51'

* commit 'e4d5b55193109d08be47c42d320334546c006b51':
  rangecoder: Kill non-compiling disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoswresample/x86/resample: extend resample_double to support avx and fma3
Muhammad Faiz [Thu, 16 Mar 2017 04:33:16 +0000 (11:33 +0700)]
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>
2 years agoMerge commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815'
Clément Bœsch [Sat, 18 Mar 2017 22:51:51 +0000 (23:51 +0100)]
Merge commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815'

* commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815':
  mathematics: Kill non-compiling disabled cruft

This commit is a noop, see 1e1513d01aa8296d55efab95143e65ccbb152c5f

Merged-by: Clément Bœsch <u@pkh.me>
2 years agolavu/mathematics: split closing bracket out of ifdefery
Clément Bœsch [Sat, 18 Mar 2017 22:49:20 +0000 (23:49 +0100)]
lavu/mathematics: split closing bracket out of ifdefery

2 years agolavu/mathematics: document so-called "cruft"
Clément Bœsch [Sat, 18 Mar 2017 22:48:22 +0000 (23:48 +0100)]
lavu/mathematics: document so-called "cruft"

2 years agoMerge commit '5a667322f5cb0e77c15891fc06725c19d8f3314f'
Clément Bœsch [Sat, 18 Mar 2017 19:07:39 +0000 (20:07 +0100)]
Merge commit '5a667322f5cb0e77c15891fc06725c19d8f3314f'

* commit '5a667322f5cb0e77c15891fc06725c19d8f3314f':
  vaapi_vc1: Remove redundant version check

This commit is a noop, see d07d01bcce4dd145d04bd936b5d2d268ed688e3f

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d'
Clément Bœsch [Sat, 18 Mar 2017 19:07:01 +0000 (20:07 +0100)]
Merge commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d'

* commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d':
  vaapi_vc1: Constify pointers

This commit is a noop, see 845c2c140b5ec9774dba5d92459b581eba79a788

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29'
Clément Bœsch [Sat, 18 Mar 2017 19:05:36 +0000 (20:05 +0100)]
Merge commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29'

* commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29':
  vaapi_mpeg2: Constify pointers

This commit is a noop, see 6bc2808c41a3f1c7fb7655fc4835d74fdcf87464

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '03adfe913062c6995136eb1ca51152b6d596c0f4'
Clément Bœsch [Sat, 18 Mar 2017 19:03:10 +0000 (20:03 +0100)]
Merge commit '03adfe913062c6995136eb1ca51152b6d596c0f4'

* commit '03adfe913062c6995136eb1ca51152b6d596c0f4':
  vaapi_h264: Constify pointers

This commit is a noop, see d0897da924509736849408cbbbc20ba42ea092bd

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f'
Clément Bœsch [Sat, 18 Mar 2017 19:02:10 +0000 (20:02 +0100)]
Merge commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f'

* commit '121f34d5f0c8d7d376829a467590fbbe4c228f4f':
  hwcontext_vaapi: Try the first render node as the default DRM device

This commit is a noop, see 8d47d8407569aade0c0d564600919349789dc38b

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '6fc944e6136b050bf965f847bbfd69e1fe572f82'
Clément Bœsch [Sat, 18 Mar 2017 19:01:22 +0000 (20:01 +0100)]
Merge commit '6fc944e6136b050bf965f847bbfd69e1fe572f82'

* commit '6fc944e6136b050bf965f847bbfd69e1fe572f82':
  Prepare for 12_alpha1 Release

This commit is a noop.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5'
Clément Bœsch [Sat, 18 Mar 2017 18:59:48 +0000 (19:59 +0100)]
Merge commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5'

* commit 'f6d2fed811dea36c4ebaf991927e44c78eb0aca5':
  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 af1761f7b5b1b72197dc40934953b775c2d951cc

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'
Clément Bœsch [Sat, 18 Mar 2017 18:45:11 +0000 (19:45 +0100)]
Merge commit '602abe77b02f9702c18c2787d208fcfc9d94b70f'

* commit '602abe77b02f9702c18c2787d208fcfc9d94b70f':
  avconv: Check the fifo allocation

This commit is a noop, see af1761f7b5b1b72197dc40934953b775c2d951cc

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f2143c57b6a61fef382f3128138d8558a9bdecee'
Clément Bœsch [Sat, 18 Mar 2017 18:38:52 +0000 (19:38 +0100)]
Merge commit 'f2143c57b6a61fef382f3128138d8558a9bdecee'

* commit 'f2143c57b6a61fef382f3128138d8558a9bdecee':
  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>
2 years agoMerge commit '04763c6f87690b31cfcd0d324cf36a451531dcd0'
Clément Bœsch [Sat, 18 Mar 2017 18:31:57 +0000 (19:31 +0100)]
Merge commit '04763c6f87690b31cfcd0d324cf36a451531dcd0'

* commit '04763c6f87690b31cfcd0d324cf36a451531dcd0':
  h264_direct: use the reference mask from the actual reference

This commit is a noop, see d8151a7e944aea52d167571badc247c8d9972847

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225'
Clément Bœsch [Sat, 18 Mar 2017 18:25:56 +0000 (19:25 +0100)]
Merge commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225'

* commit 'e9bfff1cc66c85b91b262c41e8aa5e8685606225':
  lavc: free buffer_frame/pkt on avcodec_open2() failure

This commit is a noop, see 27adf9f9cdbc6f1dc0a1292dc97490eec6f2f068.

Only reordered to reduce diff.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'
Clément Bœsch [Sat, 18 Mar 2017 18:22:30 +0000 (19:22 +0100)]
Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'

* commit 'ec021d48445a414325ad59a73f9cde3212b173e4':
  buffer: fix av_buffer_pool_init2() documentation

Merged-by: Clément Bœsch <u@pkh.me>
2 years agocompat/atomics/gcc: use __typeof__ instead of typeof
James Almer [Tue, 7 Mar 2017 03:04:46 +0000 (00:04 -0300)]
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>
2 years agolavfi: deprecate AVFilterGraph->resample_lavr_opts
Rostislav Pehlivanov [Mon, 6 Mar 2017 02:46:50 +0000 (02:46 +0000)]
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>
2 years agoswresample/swresample: do not use s32p internally by default when resampling
Muhammad Faiz [Thu, 16 Mar 2017 05:35:11 +0000 (12:35 +0700)]
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>
2 years agolavc/avcodec: Constify AVBitStreamFilter* in AVBitStreamFilterContext struct.
Carl Eugen Hoyos [Thu, 16 Mar 2017 21:31:44 +0000 (22:31 +0100)]
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

2 years agomov: Drop extra format specifier in error message
Vittorio Giovara [Fri, 17 Mar 2017 19:29:51 +0000 (15:29 -0400)]
mov: Drop extra format specifier in error message

2 years agospherical: Change types of bounding and pad to uint32_t
Vittorio Giovara [Thu, 16 Mar 2017 21:20:47 +0000 (17:20 -0400)]
spherical: Change types of bounding and pad to uint32_t

These values are defined to be 32bit in the specification,
so it makes more sense to store them as fixed width.

Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2 years agofate: Do not report side data size
Vittorio Giovara [Wed, 8 Mar 2017 00:15:28 +0000 (19:15 -0500)]
fate: Do not report side data size

This field is of little value, and interferes with testing side data,
since sizes can be different on multiple architectures.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2 years agoMerge commit '0638b99cdba52554691fc668d9e477bc184c7a33'
Matthieu Bouron [Fri, 17 Mar 2017 12:31:03 +0000 (13:31 +0100)]
Merge commit '0638b99cdba52554691fc668d9e477bc184c7a33'

* commit '0638b99cdba52554691fc668d9e477bc184c7a33':
aiff: Skip padding byte for odd-sized chunks

Also removes to odd-size checks from get_aiff_header and get_meta to use
the generic path introduced by the original commit.

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
2 years agoavcodec: estimate output bitrate for uncompressed video codecs
Tobias Rapp [Mon, 6 Mar 2017 07:53:28 +0000 (08:53 +0100)]
avcodec: estimate output bitrate for uncompressed video codecs

Allows to get a more realistic total bitrate (and estimated file size)
in avi_write_header. Previously a static default value of 200k was
assumed.

Adds an internal helper function for bitrate guessing.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffmpeg: set the encoding framerate when the output is CFR
Anton Khirnov [Sat, 1 Oct 2016 09:47:23 +0000 (11:47 +0200)]
ffmpeg: set the encoding framerate when the output is CFR

(cherry picked from Libav commit d10102d23c9467d4eb84f58e0cd12be284b982f6)

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2 years agoavcodec/nvenc: allow different const-qps for I, P and B frames
Konda Raju [Fri, 17 Mar 2017 04:12:25 +0000 (09:42 +0530)]
avcodec/nvenc: allow different const-qps for I, P and B frames

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
2 years agoswresample/resample: do not assert compensation_distance on rebuild_filter
Muhammad Faiz [Fri, 17 Mar 2017 00:46:20 +0000 (07:46 +0700)]
swresample/resample: do not assert compensation_distance on rebuild_filter

when set_compensation is called with zero sample_delta,
compensation does not happen (because dst_incr == ideal_dst_incr)
but compensation_distance is set

regression since 01ebb57c03abde89bca7bdbc552917efcb8f551d

Found-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2 years agoavcodec: fix uninitialized variable read
wm4 [Tue, 7 Mar 2017 08:56:42 +0000 (09:56 +0100)]
avcodec: fix uninitialized variable read

This cna happen if the user tries to call the new decode API for
subtitles.

Fixes CID 1402071.

2 years agolavu/spherical: Make AVSphericalMapping pointer parameter const.
Carl Eugen Hoyos [Thu, 16 Mar 2017 20:19:48 +0000 (21:19 +0100)]
lavu/spherical: Make AVSphericalMapping pointer parameter const.

Reflects the actual code and silences a gcc warning:
ffprobe.c:1797:42: warning: passing argument 1 of 'av_spherical_tile_bounds' discards 'const' qualifier from pointer target type