ffmpeg.git
2 years agoavcodec/clearvideo: Fix multiple runtime error: left shift of negative value -1024
Michael Niedermayer [Sat, 6 May 2017 10:17:01 +0000 (12:17 +0200)]
avcodec/clearvideo: Fix multiple runtime error: left shift of negative value -1024

Fixes: 1360/clusterfuzz-testcase-minimized-5606472043986944

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/fic: Fix multiple left shift of negative value -15
Michael Niedermayer [Sat, 6 May 2017 10:10:59 +0000 (12:10 +0200)]
avcodec/fic: Fix multiple left shift of negative value -15

Fixes: 1356/clusterfuzz-testcase-minimized-6008489086287872

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/mlpdec: Fix runtime error: left shift of negative value -22
Michael Niedermayer [Sat, 6 May 2017 10:05:17 +0000 (12:05 +0200)]
avcodec/mlpdec: Fix runtime error: left shift of negative value -22

Fixes: 1355/clusterfuzz-testcase-minimized-6662205472768000

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: Avoid splitting side data repeatedly
Michael Niedermayer [Thu, 4 May 2017 15:15:18 +0000 (17:15 +0200)]
avcodec: Avoid splitting side data repeatedly

Fixes Timeout
Fixes: 508/clusterfuzz-testcase-6245747678773248

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/snowdec: Check qbias
Michael Niedermayer [Fri, 5 May 2017 23:08:54 +0000 (01:08 +0200)]
avcodec/snowdec: Check qbias

Fixes: signed integer overflow: -1094995529 * 131 cannot be represented in type 'int'
Fixes: 1353/clusterfuzz-testcase-minimized-5208180449607680

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/hevc_parser: cosmetics
James Almer [Fri, 5 May 2017 23:02:30 +0000 (20:02 -0300)]
avcodec/hevc_parser: cosmetics

Reduces differences with libav slightly.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: move hevc_find_frame_end() down in the file
James Almer [Fri, 5 May 2017 22:26:56 +0000 (19:26 -0300)]
avcodec/hevc_parser: move hevc_find_frame_end() down in the file

Reduces differences with libav.

2 years agoavutil/softfloat: Fix multiple runtime error: left shift of negative value -8
Michael Niedermayer [Fri, 5 May 2017 22:13:05 +0000 (00:13 +0200)]
avutil/softfloat: Fix multiple runtime error: left shift of negative value -8

Fixes: 1352/clusterfuzz-testcase-minimized-5757565017260032

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/ivi: Free custom blk_vlc
Michael Niedermayer [Fri, 5 May 2017 22:08:38 +0000 (00:08 +0200)]
avcodec/ivi: Free custom blk_vlc

Fixes memleak
Fixes: 1351/clusterfuzz-testcase-minimized-5861971645693952

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/aacsbr_template: Do not leave bs_num_env invalid
Michael Niedermayer [Fri, 5 May 2017 21:00:59 +0000 (23:00 +0200)]
avcodec/aacsbr_template: Do not leave bs_num_env invalid

Fixes out of array read
Fixes: 1349/clusterfuzz-testcase-minimized-5370707196248064

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/mdec: Fix signed integer overflow: 28835400 * 83 cannot be represented in...
Michael Niedermayer [Fri, 5 May 2017 20:17:59 +0000 (22:17 +0200)]
avcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be represented in type 'int'

Fixes: 1346/clusterfuzz-testcase-minimized-5776732600664064

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 agodoc/libav_merge: remove line about ADVANCED_PARSER
James Almer [Sun, 30 Apr 2017 20:17:34 +0000 (17:17 -0300)]
doc/libav_merge: remove line about ADVANCED_PARSER

It's been addressed.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parse: decode SEI message NALUs in extradata
James Almer [Sun, 30 Apr 2017 16:05:52 +0000 (13:05 -0300)]
avcodec/hevc_parse: decode SEI message NALUs in extradata

They may be available in hvcc style extradata.

Based on a patch by Hendrik Leppkes.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: move slice header parsing to its own function
James Almer [Mon, 1 May 2017 17:32:07 +0000 (14:32 -0300)]
avcodec/hevc_parser: move slice header parsing to its own function

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: remove HEVCContext usage
James Almer [Sun, 30 Apr 2017 19:57:41 +0000 (16:57 -0300)]
avcodec/hevc_parser: remove HEVCContext usage

This gets rid of the duplicate, limited parser.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: use ff_h2645_packet_split() to parse NAL units
James Almer [Sun, 30 Apr 2017 16:48:22 +0000 (13:48 -0300)]
avcodec/hevc_parser: use ff_h2645_packet_split() to parse NAL units

This simplifies the code considerably.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: move SliceHeader struct definition to hevc_ps
James Almer [Sun, 30 Apr 2017 19:52:51 +0000 (16:52 -0300)]
avcodec/hevcdec: move SliceHeader struct definition to hevc_ps

This is in preparation for a following patch.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()
James Almer [Sun, 30 Apr 2017 19:49:41 +0000 (16:49 -0300)]
avcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()

Move it to hevc_ps as well. This is in preparation for a following patch.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: move SEI message parsing into a separate header
James Almer [Sun, 30 Apr 2017 14:34:06 +0000 (11:34 -0300)]
avcodec/hevcdec: move SEI message parsing into a separate header

It doesn't depend on hevcdec anymore.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: remove HEVCContext usage from hevc_sei
James Almer [Sun, 30 Apr 2017 01:01:03 +0000 (22:01 -0300)]
avcodec/hevcdec: remove HEVCContext usage from hevc_sei

Based on the H264 SEI implementation.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/dfa: Fix off by 1 error
Michael Niedermayer [Fri, 5 May 2017 18:42:11 +0000 (20:42 +0200)]
avcodec/dfa: Fix off by 1 error

Fixes out of array access
Fixes: 1345/clusterfuzz-testcase-minimized-6062963045695488

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/nellymoser: Fix multiple left shift of negative value -8591
Michael Niedermayer [Fri, 5 May 2017 17:28:56 +0000 (19:28 +0200)]
avcodec/nellymoser: Fix multiple left shift of negative value -8591

Fixes: 1342/clusterfuzz-testcase-minimized-5490842129137664

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/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be represented in...
Michael Niedermayer [Fri, 5 May 2017 17:26:02 +0000 (19:26 +0200)]
avcodec/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be represented in type 'int'

Fixes: 1341/clusterfuzz-testcase-minimized-5441502618583040

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/g722: Fix multiple runtime error: left shift of negative value -1
Michael Niedermayer [Fri, 5 May 2017 16:14:03 +0000 (18:14 +0200)]
avcodec/g722: Fix multiple runtime error: left shift of negative value -1

Fixes: 1340/clusterfuzz-testcase-minimized-4669892148068352

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/dss_sp: Fix multiple left shift of negative value -466
Michael Niedermayer [Fri, 5 May 2017 16:07:25 +0000 (18:07 +0200)]
avcodec/dss_sp: Fix multiple left shift of negative value -466

Fixes: 1339/clusterfuzz-testcase-minimized-4614671485108224

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/wnv1: Fix runtime error: left shift of negative value -1
Michael Niedermayer [Fri, 5 May 2017 16:01:25 +0000 (18:01 +0200)]
avcodec/wnv1: Fix runtime error: left shift of negative value -1

Fixes: 1338/clusterfuzz-testcase-minimized-6485546354343936

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 agoMerge commit 'b68e353136db6f963212c457281d9716516cdc59'
Clément Bœsch [Fri, 5 May 2017 12:11:51 +0000 (14:11 +0200)]
Merge commit 'b68e353136db6f963212c457281d9716516cdc59'

* commit 'b68e353136db6f963212c457281d9716516cdc59':
  qsvdec: do not sync PIX_FMT_QSV surfaces

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'
Clément Bœsch [Fri, 5 May 2017 12:09:34 +0000 (14:09 +0200)]
Merge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'

* commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa':
  dxva2: allow an empty array of ID3D11VideoDecoderOutputView

This commit is a noop, see 8fb48659018f17827c2d5a3ba72263f421fdfa2d

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'
Clément Bœsch [Fri, 5 May 2017 12:08:12 +0000 (14:08 +0200)]
Merge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'

* commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60':
  dxva2: get the slice number directly from the surface in D3D11VA

This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'
Clément Bœsch [Fri, 5 May 2017 11:53:11 +0000 (13:53 +0200)]
Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'

* commit '122de16dd8108a59a55d30543c9f28b5f61b02d1':
  Replace cmdutils_common_opts.h by a macro

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '2a2889e130fee6d3c11e506328388afb317626ed'
Clément Bœsch [Fri, 5 May 2017 11:43:18 +0000 (13:43 +0200)]
Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'

* commit '2a2889e130fee6d3c11e506328388afb317626ed':
  build: Remove stray duplicate conditional variable declaration

This commit is a noop, there is no duplicate in FFmpeg. we have the
tools rules kept in the root Makefile though (see
802d94c36edcd05b53a56ee359d9559cc4e11597)

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoavcodec/aacps: Fix undefined behavior
Michael Niedermayer [Fri, 5 May 2017 11:16:07 +0000 (13:16 +0200)]
avcodec/aacps: Fix undefined behavior

Fixes: 1337/clusterfuzz-testcase-minimized-5212314171080704

Fixes the existence of a potentially invalid pointer intermediate

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/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'
Michael Niedermayer [Fri, 5 May 2017 11:02:22 +0000 (13:02 +0200)]
avcodec/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'

Fixes: 1336/clusterfuzz-testcase-minimized-4761381930795008

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/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer doing so
Michael Niedermayer [Fri, 5 May 2017 10:48:12 +0000 (12:48 +0200)]
avcodec/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer doing so

Fixes: out of array access
Fixes: 1348/clusterfuzz-testcase-minimized-6195673642827776

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 agoMerge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'
Clément Bœsch [Fri, 5 May 2017 11:34:03 +0000 (13:34 +0200)]
Merge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'

* commit '89725a8512721fffd190021ded2d3f5b42e20e2a':
  vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames

This commit is a noop, see eefa4b76ee5a1059a36d8bd77b123c2cfbfea604

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'
Clément Bœsch [Fri, 5 May 2017 11:33:24 +0000 (13:33 +0200)]
Merge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'

* commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f':
  vaapi_encode: Support forcing IDR frames via AVFrame.pict_type

This commit is a noop, see c667c0979cbc2e04d1d00964b82ac49746caa43c

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'
Clément Bœsch [Fri, 5 May 2017 11:32:29 +0000 (13:32 +0200)]
Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'

* commit '37fab0661a760b2a9d727939d72e629acee1a6ef':
  vaapi_encode: Fix GOP sizing

This commit is a noop, see 760f1a7727583e07efb1d4b0d8e28a1dd2c54a93

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2'
Clément Bœsch [Fri, 5 May 2017 11:31:35 +0000 (13:31 +0200)]
Merge commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2'

* commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2':
  interplayvideo: Convert to the new bitstream reader
  adx: Convert to the new bitstream reader
  dvbsubdec: Convert to the new bitstream reader
  motionpixels: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'
Clément Bœsch [Fri, 5 May 2017 11:27:03 +0000 (13:27 +0200)]
Merge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'

* commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14':
  hmac: Explicitly convert types at function pointer assignment

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agolavu/sha512: update length argument following sha+md5 changes
Clément Bœsch [Fri, 5 May 2017 11:21:39 +0000 (13:21 +0200)]
lavu/sha512: update length argument following sha+md5 changes

2 years agoMerge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'
Clément Bœsch [Fri, 5 May 2017 11:04:24 +0000 (13:04 +0200)]
Merge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'

* commit 'e435beb1ea5380a90774dbf51fdc8c941e486551':
  crypto: consistently use size_t as type for length parameters

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
Clément Bœsch [Fri, 5 May 2017 09:33:17 +0000 (11:33 +0200)]
Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'

* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
  h264dec: make ff_h264_decode_init() static

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'
Clément Bœsch [Fri, 5 May 2017 09:32:32 +0000 (11:32 +0200)]
Merge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'

* commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851':
  h264dec: drop a redundant check

This commit is a noop, see 4cc1ce4a91788a71670ea43fa0026b5a969e9e9e

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'
Clément Bœsch [Fri, 5 May 2017 09:31:01 +0000 (11:31 +0200)]
Merge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'

* commit '3cba1ad76d362c994fa98fb686e04e20826fb579':
  x86inc: Avoid using eax/rax for storing the stack pointer

This commit is a noop, see cd09e3b34903db7b7e37fdb4d3e10549bf8b2e82

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'e199a8099411d0992c3ed278287a81f1d791199c'
Clément Bœsch [Fri, 5 May 2017 09:29:21 +0000 (11:29 +0200)]
Merge commit 'e199a8099411d0992c3ed278287a81f1d791199c'

* commit 'e199a8099411d0992c3ed278287a81f1d791199c':
  Changelog: mention the new avbuild/ directory

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'
Clément Bœsch [Fri, 5 May 2017 09:27:18 +0000 (11:27 +0200)]
Merge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'

* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
  fate: Skip the checkasm test if CONFIG_STATIC is disabled

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428'
Clément Bœsch [Fri, 5 May 2017 09:26:39 +0000 (11:26 +0200)]
Merge commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428'

* commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428':
  hevcdec: add P010 support for D3D11VA

This commit is a noop, see ccb94789e2968329947f1c2e00d019f387f9c409

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '0ac2d86c4758e1419934905b6c092910296aa16a'
Clément Bœsch [Fri, 5 May 2017 08:51:09 +0000 (10:51 +0200)]
Merge commit '0ac2d86c4758e1419934905b6c092910296aa16a'

* commit '0ac2d86c4758e1419934905b6c092910296aa16a':
  dxva2: Factorize DXVA context validity test into a single macro

This commit is (mostly) a noop, see 77742c75c5503c848447814a96f16abc6b9aa5f4

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'
Clément Bœsch [Fri, 5 May 2017 08:48:36 +0000 (10:48 +0200)]
Merge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'

* commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a':
  dxva2: Make ff_dxva2_get_surface() static and drop its name prefix

This commit is a noop, see fd0716b364f83257caab723e2bb7c65483cb2073

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'
Clément Bœsch [Fri, 5 May 2017 08:46:24 +0000 (10:46 +0200)]
Merge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'

* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
  matroskadec: make sure not to leave EbmlBin in an inconsistent state

This commit is a noop, see 5e1bacf2d49622f7ba4245f140b7be35972c0529

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'
Clément Bœsch [Fri, 5 May 2017 08:40:42 +0000 (10:40 +0200)]
Merge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'

* commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20':
  vaapi_h264: Fix POC on IDR frames

This commit is a noop, see e72662e131e5099e34d5a7519c5690d2fff7b83f

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552'
Clément Bœsch [Fri, 5 May 2017 08:39:18 +0000 (10:39 +0200)]
Merge commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552'

* commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552':
  vaapi_h265: Fix build failure with old libva without 10-bit surfaces

This commit is a noop, see b9514756ba2b4f764fb86500a8172a57acb58403

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba'
Clément Bœsch [Fri, 5 May 2017 08:38:14 +0000 (10:38 +0200)]
Merge commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba'

* commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba':
  aarch64: vp9mc: Fix a comment to refer to a register with the right name

This commit is a noop, see 0ba0187535498b34d23aa73196f0ed2414dfa15c

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '65074791e8f8397600aacc9801efdd17777eb6e3'
Clément Bœsch [Fri, 5 May 2017 08:37:57 +0000 (10:37 +0200)]
Merge commit '65074791e8f8397600aacc9801efdd17777eb6e3'

* commit '65074791e8f8397600aacc9801efdd17777eb6e3':
  aarch64: vp9dsp: Fix vertical alignment in the init file

This commit is a noop, see 02cfb9a16e6fdfabea7095c0cf327e8244477ad7

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'c536e5e8698110c139b1c17938998a5547550aa3'
Clément Bœsch [Fri, 5 May 2017 08:37:31 +0000 (10:37 +0200)]
Merge commit 'c536e5e8698110c139b1c17938998a5547550aa3'

* commit 'c536e5e8698110c139b1c17938998a5547550aa3':
  arm: vp9mc: Fix vertical alignment of operands

This commit is a noop, see 656d910981b6c9fea6a34dffab37f951a661af44

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48'
Clément Bœsch [Fri, 5 May 2017 08:36:48 +0000 (10:36 +0200)]
Merge commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48'

* commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48':
  cmdutils: update copyright year to 2017

This commit is a noop, see d800d48fc67208819c2a4ae5eb214ca5e3ad7e82

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'ee164727dd64c199b87118917e674b17c25e0da3'
Clément Bœsch [Fri, 5 May 2017 08:34:54 +0000 (10:34 +0200)]
Merge commit 'ee164727dd64c199b87118917e674b17c25e0da3'

* commit 'ee164727dd64c199b87118917e674b17c25e0da3':
  configure: Fix typo in incdir variable written to config.sh

This commit is a noop, see 6fdd35a3126f6ecbe4ebab12bdf8867e4f544958

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'eef860dd92538764f4ab7872812914ff10384268'
Clément Bœsch [Fri, 5 May 2017 08:33:02 +0000 (10:33 +0200)]
Merge commit 'eef860dd92538764f4ab7872812914ff10384268'

* commit 'eef860dd92538764f4ab7872812914ff10384268':
  fate: Tweak printing of ignored tests

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '5c83b4d550ea42653fece092987bab56ccc32ead'
Clément Bœsch [Fri, 5 May 2017 08:32:52 +0000 (10:32 +0200)]
Merge commit '5c83b4d550ea42653fece092987bab56ccc32ead'

* commit '5c83b4d550ea42653fece092987bab56ccc32ead':
  fate: Unset the sig variable if ignoring a test failure

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agolavu/timecode: Increase AV_TIMECODE_STR_SIZE.
Carl Eugen Hoyos [Thu, 4 May 2017 23:23:24 +0000 (01:23 +0200)]
lavu/timecode: Increase AV_TIMECODE_STR_SIZE.

Fixes the following warning:
libavutil/timecode.c:103:60: warning: '%02d' directive output may be truncated writing between 2 and 10 bytes into a region of size between 0 and 7

2 years agoMerge commit '35d1f726eb9fdd376ab900587fb02122b72f2b9a'
Clément Bœsch [Fri, 5 May 2017 07:19:41 +0000 (09:19 +0200)]
Merge commit '35d1f726eb9fdd376ab900587fb02122b72f2b9a'

* commit '35d1f726eb9fdd376ab900587fb02122b72f2b9a':
  fate: Add --ignore-tests configure option for omitting specific FATE tests

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agolibrary.mak: fix build rules that depend on pgk-config files
James Almer [Fri, 5 May 2017 03:16:06 +0000 (00:16 -0300)]
library.mak: fix build rules that depend on pgk-config files

Regression since 6fdd35a312

2 years agoavcodec/cavsdec: Fix undefined behavior from integer overflow
Michael Niedermayer [Fri, 5 May 2017 01:24:40 +0000 (03:24 +0200)]
avcodec/cavsdec: Fix undefined behavior from integer overflow

Fixes: 1335/clusterfuzz-testcase-minimized-5566961566089216

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/dvdsubdec: Fix runtime error: left shift of 242 by 24 places cannot be repres...
Michael Niedermayer [Fri, 5 May 2017 00:51:13 +0000 (02:51 +0200)]
avcodec/dvdsubdec: Fix runtime error: left shift of 242 by 24 places cannot be represented in type 'int'

Fixes: 1080/clusterfuzz-testcase-5353236754071552

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 agoMerge commit '8a34f3659371680ca523aecfd9098c28f0f809eb'
James Almer [Fri, 5 May 2017 00:49:46 +0000 (21:49 -0300)]
Merge commit '8a34f3659371680ca523aecfd9098c28f0f809eb'

* commit '8a34f3659371680ca523aecfd9098c28f0f809eb':
  build: Add version numbers to "Requires" entries in pkg-config files

This commit is a noop, see 6fdd35a3126f6ecbe4ebab12bdf8867e4f544958

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/vorbisdec: add missing comma
James Almer [Fri, 5 May 2017 00:44:58 +0000 (21:44 -0300)]
avcodec/vorbisdec: add missing comma

Should fix compilation failures after 191b2d4fc96fa87975a8eb5d87db04516b8a04c3.

Found-by: philipl
2 years agoMerge commit '53618054b64ce4dab459d23a7efebe9d5afc4855'
James Almer [Fri, 5 May 2017 00:41:43 +0000 (21:41 -0300)]
Merge commit '53618054b64ce4dab459d23a7efebe9d5afc4855'

* commit '53618054b64ce4dab459d23a7efebe9d5afc4855':
  parser: Add missing #include for printing ISO C99 conversion specifiers

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'
James Almer [Fri, 5 May 2017 00:38:00 +0000 (21:38 -0300)]
Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'

* commit '0982152c3fb05365597978c5d7cfeeb7ced01723':
  matroskadec: fix SRT subtitle duration

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '131644677970a3c4a0096270ea2a5b5d437c2e63'
James Almer [Fri, 5 May 2017 00:31:34 +0000 (21:31 -0300)]
Merge commit '131644677970a3c4a0096270ea2a5b5d437c2e63'

* commit '131644677970a3c4a0096270ea2a5b5d437c2e63':
  http: Check for negative chunk sizes

This commit is a noop, see 2a05c8f813de6f2278827734bf8102291e7484aa

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0b77a5933635293508e7289e7cf191ed166cf070'
James Almer [Fri, 5 May 2017 00:19:41 +0000 (21:19 -0300)]
Merge commit '0b77a5933635293508e7289e7cf191ed166cf070'

* commit '0b77a5933635293508e7289e7cf191ed166cf070':
  Use correct printf conversion specifiers for POSIX integer types

See 549045254c4614d5d61b5c36e340171a6914d57c

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '92db5083077a8b0f8e1050507671b456fd155125'
James Almer [Thu, 4 May 2017 22:59:30 +0000 (19:59 -0300)]
Merge commit '92db5083077a8b0f8e1050507671b456fd155125'

* commit '92db5083077a8b0f8e1050507671b456fd155125':
  build: Generate pkg-config files from Make and not from configure
  build: Store library version numbers in .version files

Includes cherry-picked commits 8a34f3659371680ca523aecfd9098c28f0f809eb and
ee164727dd64c199b87118917e674b17c25e0da3 to fix issues.

Changes were also made to retain support for raise_major and build_suffix.

Reviewed-by: ubitux
Merged-by: James Almer <jamrial@gmail.com>
2 years agocuvid: support AVCodecContext.hw_device_ctx API
wm4 [Thu, 4 May 2017 22:15:21 +0000 (00:15 +0200)]
cuvid: support AVCodecContext.hw_device_ctx API

This is a newer API that is intended for decoders like the cuvid
wrapper. Until now, the wrapper required to set an awkward
"incomplete" hw_frames_ctx to set the device. Now the device
can be set directly, and the user can get AV_PIX_FMT_CUDA output
for a specific device simply by setting hw_device_ctx.

This still does a dummy ff_get_format() call at init time, and should
be fully backward compatible.

2 years agoffmpeg: check for unconnected outputs
wm4 [Thu, 4 May 2017 22:15:15 +0000 (00:15 +0200)]
ffmpeg: check for unconnected outputs

Fixes e.g.:

ffmpeg -f lavfi -i testsrc -f lavfi -i testsrc -filter_complex "[0:v][1:v]psnr[out]" -f null none

2 years agocompat/strtod: Add missing const qualifiers.
Carl Eugen Hoyos [Mon, 1 May 2017 08:49:31 +0000 (10:49 +0200)]
compat/strtod: Add missing const qualifiers.

Fixes many warnings:
initialization discards 'const' qualifier from pointer target type

2 years agoavcodec/mjpegdec: Fix runtime error: signed integer overflow: -24543 * 2031616 cannot...
Michael Niedermayer [Thu, 27 Apr 2017 13:10:25 +0000 (15:10 +0200)]
avcodec/mjpegdec: Fix runtime error: signed integer overflow: -24543 * 2031616 cannot be represented in type 'int'

Fixes: 943/clusterfuzz-testcase-5114865297391616

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/wavpack: Fix invalid shift and integer overflow
Michael Niedermayer [Fri, 7 Apr 2017 01:38:12 +0000 (03:38 +0200)]
avcodec/wavpack: Fix invalid shift and integer overflow

Fixes: 940/clusterfuzz-testcase-5200378381467648

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/flicvideo: Check for chunk overread
Michael Niedermayer [Mon, 1 May 2017 20:54:15 +0000 (22:54 +0200)]
avcodec/flicvideo: Check for chunk overread

Fixes integer overflow
Fixes: 1292/clusterfuzz-testcase-minimized-5795512143839232

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolibavcodec/mpeg4videodec: Convert sprite_offset to 64bit
Michael Niedermayer [Wed, 3 May 2017 03:21:51 +0000 (05:21 +0200)]
libavcodec/mpeg4videodec: Convert sprite_offset to 64bit

This avoids intermediates from overflowing (the final values are checked)
Fixes: runtime error: signed integer overflow: -167712 + -2147352576 cannot be represented in type 'int'

Fixes: 1298/clusterfuzz-testcase-minimized-5955580877340672

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/pngdec: Use ff_set_dimensions()
Michael Niedermayer [Thu, 4 May 2017 16:40:46 +0000 (18:40 +0200)]
avcodec/pngdec: Use ff_set_dimensions()

Fixes OOM
Fixes: 1314/clusterfuzz-testcase-minimized-4621997222920192

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/msvideo1: Check buffer size before re-getting the frame
Michael Niedermayer [Thu, 4 May 2017 13:24:46 +0000 (15:24 +0200)]
avcodec/msvideo1: Check buffer size before re-getting the frame

Fixes timeout
Fixes: 1306/clusterfuzz-testcase-minimized-6152296217968640

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 agoconfigure: Do not add omit-frame-pointer for ossfuzz
Michael Niedermayer [Thu, 4 May 2017 11:56:40 +0000 (13:56 +0200)]
configure: Do not add omit-frame-pointer for ossfuzz

ossfuzz works better without it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotools/target_dec_fuzzer: Fix memleak on open failure
Michael Niedermayer [Thu, 4 May 2017 11:31:02 +0000 (13:31 +0200)]
tools/target_dec_fuzzer: Fix memleak on open failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoconfigure: fix libopus detection
James Almer [Thu, 4 May 2017 03:26:13 +0000 (00:26 -0300)]
configure: fix libopus detection

Prevents compilation failures on libopus < 1.0.3
Regression since 37941878.

2 years agoavformat/concatdec: port to the new bitstream filter API
James Almer [Wed, 26 Apr 2017 03:36:17 +0000 (00:36 -0300)]
avformat/concatdec: port to the new bitstream filter API

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agotools/target_dec_fuzzer: Use decoder and not codec_id as argument
Michael Niedermayer [Wed, 3 May 2017 14:36:39 +0000 (16:36 +0200)]
tools/target_dec_fuzzer: Use decoder and not codec_id as argument

This allows fuzzing decoders with the same codec_id
We also avoid register all to allow the linker to prune unused sections and symbols

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
Clément Bœsch [Wed, 3 May 2017 10:51:48 +0000 (12:51 +0200)]
Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'

* commit '11a9320de54759340531177c9f2b1e31e6112cc2':
  build: Move build-system-related helper files to a separate subdirectory

"ffbuild" directory name is used instead of "avbuild".

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'
Clément Bœsch [Wed, 3 May 2017 10:28:54 +0000 (12:28 +0200)]
Merge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'

* commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa':
  ratecontrol: Drop xvid-rc-related struct members unused after a6901b9c6

This commit is a noop, see 99b35a51ccbe2fc98530e5cf7529e7d377e1165e

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'
Clément Bœsch [Wed, 3 May 2017 10:28:20 +0000 (12:28 +0200)]
Merge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'

* commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b':
  nvenc: Update check for lookahead

This commit is a noop, see 67db4ff3b66e96a20ddf1c264d07e146334ae88e

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2'
Clément Bœsch [Wed, 3 May 2017 10:26:53 +0000 (12:26 +0200)]
Merge commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2'

* commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2':
  aarch64: vp9itxfm: Use the offset parameter to movrel

This commit is a noop, see 8b11a89c06b94632d545f67ca508bd9c05c435ac

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'fc322d6a70189da24dbd445c710bb214eb031ce7'
Clément Bœsch [Wed, 3 May 2017 10:25:43 +0000 (12:25 +0200)]
Merge commit 'fc322d6a70189da24dbd445c710bb214eb031ce7'

* commit 'fc322d6a70189da24dbd445c710bb214eb031ce7':
  tta: Convert to the new bitstream reader
  mlp: Convert to the new bitstream reader
  unary: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '45286a625c6ced1f5c4c842244cbb4509429abba'
Clément Bœsch [Wed, 3 May 2017 10:24:41 +0000 (12:24 +0200)]
Merge commit '45286a625c6ced1f5c4c842244cbb4509429abba'

* commit '45286a625c6ced1f5c4c842244cbb4509429abba':
  h264dec: make sure to only end a field if it has been started

This commit is a noop. Our h264 slicing handling is different and does
not seem to be affected by the issue.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavcodec/svq3: Reject dx/dy beyond 16bit
Michael Niedermayer [Thu, 27 Apr 2017 13:10:26 +0000 (15:10 +0200)]
avcodec/svq3: Reject dx/dy beyond 16bit

The code does use 16bit sized arrays later so larger deltas would not work

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/svq3: Increase offsets to prevent integer overflows
Michael Niedermayer [Thu, 27 Apr 2017 13:10:25 +0000 (15:10 +0200)]
avcodec/svq3: Increase offsets to prevent integer overflows

Fixes: 1280/clusterfuzz-testcase-minimized-6102353767825408

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 agolavc/jpeg2000dec: Fix jp2 inner atom size used for overread checks.
Carl Eugen Hoyos [Tue, 2 May 2017 14:09:11 +0000 (16:09 +0200)]
lavc/jpeg2000dec: Fix jp2 inner atom size used for overread checks.

2 years agoavcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders
James Almer [Mon, 1 May 2017 23:01:22 +0000 (20:01 -0300)]
avcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavutil/softfloat: use ldexp(), fixes undefined shift
Michael Niedermayer [Tue, 2 May 2017 01:56:13 +0000 (03:56 +0200)]
avutil/softfloat: use ldexp(), fixes undefined shift

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffmpeg: count packets when queued
Muhammad Faiz [Tue, 2 May 2017 00:22:31 +0000 (07:22 +0700)]
ffmpeg: count packets when queued

Because write_packet() fakely writes packets to muxer by queueing
them when muxer hasn't been initialized, it should also increment
frame_number fakely.
This is required because code in do_streamcopy() rely on
frame_number.

Should fix Ticket6227

Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2 years agoavcodec/decode: do not treat discarded frames as eof when draining
Muhammad Faiz [Mon, 1 May 2017 00:34:25 +0000 (07:34 +0700)]
avcodec/decode: do not treat discarded frames as eof when draining

Fix fate failures:
    make fate-mov THREADS=32

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2 years agoavfilter/interlace: add complex vertical low-pass filter
Thomas Mundt [Thu, 20 Apr 2017 21:33:39 +0000 (23:33 +0200)]
avfilter/interlace: add complex vertical low-pass filter

This complex (-1 2 6 2 -1) filter slightly less reduces interlace 'twitter' but better retain detail and subjective sharpness impression compared to the linear (1 2 1) filter.

Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolavf/nutdec: Fix an impossible condition, regression since e0c53c34.
Carl Eugen Hoyos [Tue, 2 May 2017 06:43:12 +0000 (08:43 +0200)]
lavf/nutdec: Fix an impossible condition, regression since e0c53c34.

Fixes ticket #6362.