ffmpeg.git
23 months agoavcodec/x86/lossless_videoencdsp: Fix handling of small widths
Michael Niedermayer [Fri, 29 Sep 2017 22:20:09 +0000 (00:20 +0200)]
avcodec/x86/lossless_videoencdsp: Fix handling of small widths

Fixes out of array access
Fixes: crash-huf.avi

Regression since: 6b41b4414934cc930468ccd5db598dd6ef643987

This could also be fixed by adding checks in the C code that calls the dsp

Found-by: Zhibin Hu and 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/v4l2: set sizeimage param for non-raw buffers [fixes #6716]
Jorge Ramirez-Ortiz [Wed, 4 Oct 2017 19:04:16 +0000 (21:04 +0200)]
avcodec/v4l2: set sizeimage param for non-raw buffers [fixes #6716]

Some V4L2 drivers fail to allocate buffers when sizeimage is not set
to a max value. This is indeed the case for s5p-mfc [1]

Most drivers should be able to calculate this value from the frame
dimensions and format - or at least have their own default.

However since this work around should not impact those drivers doing
the "right thing" this commit just provides such a default.

The calculations were extracted from the v4l2 driver used to develop
the ffmpeg v4l2_m2m support [2]. See venc.c and vdec.c

[1] linux.git/drivers/media/platform/s5p-mfc
[2] linux.git/drivers/media/platform/qcom/venus/

23 months agolavc/v4l2: Mark static const tables as such
Mark Thompson [Tue, 3 Oct 2017 20:02:25 +0000 (21:02 +0100)]
lavc/v4l2: Mark static const tables as such

23 months agolavc/v4l2: Remove use of lfind()
Mark Thompson [Tue, 3 Oct 2017 19:57:14 +0000 (20:57 +0100)]
lavc/v4l2: Remove use of lfind()

This is not present in older bionic and therefore fails to build there,
and the code is much simpler without it anyway.

23 months agoconfigure: fix detecting libdl when dlsym requires extra linker flags
James Almer [Wed, 4 Oct 2017 21:55:32 +0000 (18:55 -0300)]
configure: fix detecting libdl when dlsym requires extra linker flags

Regression since 84b3f53acadced2dd31f6be95b491b25183b8c22.

23 months agoavdevice/decklink: Fix segfault when running -list_devices on OSX
Devin Heitmueller [Tue, 26 Sep 2017 16:06:20 +0000 (12:06 -0400)]
avdevice/decklink: Fix segfault when running -list_devices on OSX

The string is allocated with CFStringGetCString but was being
deallocated with free(), which would intermittently result in
a segmentation fault.  Use the correct function for freeing the
allocated CFString.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agoavdevice/decklink_dec: fix multipacket op47 decoding
Marton Balint [Sat, 30 Sep 2017 21:40:45 +0000 (23:40 +0200)]
avdevice/decklink_dec: fix multipacket op47 decoding

It was disabled by mistake.

Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agoMAINTAINERS: change the decklink maintainer to myself
Marton Balint [Sat, 30 Sep 2017 21:37:01 +0000 (23:37 +0200)]
MAINTAINERS: change the decklink maintainer to myself

Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agomovenc: take packet dts shifting into mention in check_pkt
Jan Ekström [Fri, 29 Sep 2017 22:04:00 +0000 (01:04 +0300)]
movenc: take packet dts shifting into mention in check_pkt

This FFmpeg-specific "fuzzer fix" was never perfect, but now it
stopped encoding of actual content with a big enough DTS shift.
This returns the function to its original state of results
before negative CTS offsets were added.

I remember dealing with this function before, but somehow had
forgotten about it during VDD. The test cases not tripping this
over also didn't help.

23 months agobuild: make h264 VT encoder select the VT encoder dependency
Clément Bœsch [Fri, 29 Sep 2017 09:05:33 +0000 (11:05 +0200)]
build: make h264 VT encoder select the VT encoder dependency

Otherwise, it's never enabled unless the user explicitely enables it.

Regression since 9ef5a2f5f30bdc4ac86275ae4b4708ab4681b21d.

Fixes Ticket #6702.

23 months agoMerge commit 'd154bdd3d053128c908a994bb26e14bbc17f0e53'
James Almer [Wed, 4 Oct 2017 04:05:56 +0000 (01:05 -0300)]
Merge commit 'd154bdd3d053128c908a994bb26e14bbc17f0e53'

* commit 'd154bdd3d053128c908a994bb26e14bbc17f0e53':
  configure: Simplify dlopen check

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'd7b2bb5391bf55e8f9421bff7feb4c1fddfac4bf'
James Almer [Wed, 4 Oct 2017 04:03:29 +0000 (01:03 -0300)]
Merge commit 'd7b2bb5391bf55e8f9421bff7feb4c1fddfac4bf'

* commit 'd7b2bb5391bf55e8f9421bff7feb4c1fddfac4bf':
  h264_sei: Check actual presence of picture timing SEI message

This commit is a noop, see 6a37abc59af4d87d4c55f7d812ac62d4d6a7464b

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '21cca00dfeaec08ca93cf94ed33f4311cf1d8c84'
James Almer [Wed, 4 Oct 2017 02:49:37 +0000 (23:49 -0300)]
Merge commit '21cca00dfeaec08ca93cf94ed33f4311cf1d8c84'

* commit '21cca00dfeaec08ca93cf94ed33f4311cf1d8c84':
  build: Explicitly disable external libraries when not explicitly enabled

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4'
James Almer [Wed, 4 Oct 2017 02:36:25 +0000 (23:36 -0300)]
Merge commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4'

* commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4':
  fate: Rename WMV8_DRM decoder tests to WMV3_DRM

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '79331df362fb05a0d04ca9489c87e5b80077a3f4'
James Almer [Wed, 4 Oct 2017 02:08:06 +0000 (23:08 -0300)]
Merge commit '79331df362fb05a0d04ca9489c87e5b80077a3f4'

* commit '79331df362fb05a0d04ca9489c87e5b80077a3f4':
  rtsp: Lazily set up the pollfd array once

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'
James Almer [Wed, 4 Oct 2017 02:03:10 +0000 (23:03 -0300)]
Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'

* commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d':
  nvenc: Fix the preset mapping list

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc'
James Almer [Wed, 4 Oct 2017 01:59:08 +0000 (22:59 -0300)]
Merge commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc'

* commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc':
  fate: Make null comparison method more useful

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'c483398bb7ef66f61ed2dcb09f3d6160683da0eb'
James Almer [Wed, 4 Oct 2017 01:11:58 +0000 (22:11 -0300)]
Merge commit 'c483398bb7ef66f61ed2dcb09f3d6160683da0eb'

* commit 'c483398bb7ef66f61ed2dcb09f3d6160683da0eb':
  build: Drop DOC_ prefix from EXAMPLES-related variables

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e'
James Almer [Wed, 4 Oct 2017 00:40:22 +0000 (21:40 -0300)]
Merge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e'

* commit '5263f464db5f2df74ddf712f6d1221b24475fa8e':
  rtsp: Lazily allocate the pollfd array

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86'
James Almer [Wed, 4 Oct 2017 00:37:37 +0000 (21:37 -0300)]
Merge commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86'

* commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86':
  rtsp: Move the pollfd setup out of the for loop

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '150e99d694f33ab9ad678834964909aa315d14a1'
James Almer [Wed, 4 Oct 2017 00:34:08 +0000 (21:34 -0300)]
Merge commit '150e99d694f33ab9ad678834964909aa315d14a1'

* commit '150e99d694f33ab9ad678834964909aa315d14a1':
  rtsp: Factor out packet reading

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'
James Almer [Wed, 4 Oct 2017 00:28:07 +0000 (21:28 -0300)]
Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'

* commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7':
  Use modern avconv syntax for codec selection in documentation and tests

Merged-by: James Almer <jamrial@gmail.com>
23 months agoavformat/mp3dec: Fix definition of MIDDLE_BITS
Ingo Brückl [Tue, 3 Oct 2017 13:50:37 +0000 (15:50 +0200)]
avformat/mp3dec: Fix definition of MIDDLE_BITS

The number of bits from bit #m to #n is n - m plus 1.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/dxv: Check for end of input in dxv_decompress_dxt5()
Michael Niedermayer [Sat, 30 Sep 2017 16:54:07 +0000 (18:54 +0200)]
avcodec/dxv: Check for end of input in dxv_decompress_dxt5()

Fixes: Timeout
Fixes: 3291/clusterfuzz-testcase-4630024655208448

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/truemotion2: Fix integer overflows in tm2_high_chroma()
Michael Niedermayer [Sat, 30 Sep 2017 16:54:06 +0000 (18:54 +0200)]
avcodec/truemotion2: Fix integer overflows in tm2_high_chroma()

Fixes: runtime error: signed integer overflow: -1408475220 + -1408475220 cannot be represented in type 'int'
Fixes: 3336/clusterfuzz-testcase-minimized-5656839179993088

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/aacdec_template: Clear tns present flag on error
Michael Niedermayer [Sat, 30 Sep 2017 16:54:05 +0000 (18:54 +0200)]
avcodec/aacdec_template: Clear tns present flag on error

Fixes: 3444/clusterfuzz-testcase-minimized-6270352105668608

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agompegdec: fix redundant dummy frames issue of interlaced clips
Zhong Li [Sat, 30 Sep 2017 03:22:57 +0000 (11:22 +0800)]
mpegdec: fix redundant dummy frames issue of interlaced clips

It is to fix https://trac.ffmpeg.org/ticket/6677. Actucally it is a
regression of commit 99e07a4453732058df90885f80b3db3b4f37cb3c which
always inserts a dummy frame when decode the first key field picture.

Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoMerge commit 'da8093f712d625db7ce4a2526fb52994e01921ec'
James Almer [Tue, 3 Oct 2017 23:57:54 +0000 (20:57 -0300)]
Merge commit 'da8093f712d625db7ce4a2526fb52994e01921ec'

* commit 'da8093f712d625db7ce4a2526fb52994e01921ec':
  fate: Use bitexact optimizations in the svq3-2 test

This commit is a noop, see b591329c3afe445c45eaecadd5fe3b80a837ee2f

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '984736dd9e5b50987a5910e22495304e4a6d975c'
James Almer [Tue, 3 Oct 2017 23:35:17 +0000 (20:35 -0300)]
Merge commit '984736dd9e5b50987a5910e22495304e4a6d975c'

* commit '984736dd9e5b50987a5910e22495304e4a6d975c':
  lavc: make sure not to return EAGAIN from codecs

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '4cc0227040adb9efc63be6a5765e3214f5c6f662'
James Almer [Tue, 3 Oct 2017 23:31:08 +0000 (20:31 -0300)]
Merge commit '4cc0227040adb9efc63be6a5765e3214f5c6f662'

* commit '4cc0227040adb9efc63be6a5765e3214f5c6f662':
  apetag: account for header size if present when returning the start position
  apetag: fix flag value to signal footer presence

This commit is a noop, see
e8d6fef3161f35878f8e0abf9d27d2c45a5d40b6
84d874a680ff647bc84de44967b638f246a8b832

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'b2788fe9347c02b1355574f3d28d60bfe1250ea7'
James Almer [Tue, 3 Oct 2017 23:28:51 +0000 (20:28 -0300)]
Merge commit 'b2788fe9347c02b1355574f3d28d60bfe1250ea7'

* commit 'b2788fe9347c02b1355574f3d28d60bfe1250ea7':
  svq3: fix the slice size check

Merged-by: James Almer <jamrial@gmail.com>
23 months agodoc: Add mailing list FAQ
Lou Logan [Wed, 27 Sep 2017 22:35:12 +0000 (14:35 -0800)]
doc: Add mailing list FAQ

Signed-off-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Kieran O Leary <kieran.o.leary@gmail.com>
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
23 months agoMerge commit 'cd7a2e1502f174c725c0de82711d2c7649057574'
James Almer [Tue, 3 Oct 2017 23:12:15 +0000 (20:12 -0300)]
Merge commit 'cd7a2e1502f174c725c0de82711d2c7649057574'

* commit 'cd7a2e1502f174c725c0de82711d2c7649057574':
  asfdec: fix reading files larger than 2GB

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '248dc5c1646dcdd96fe79761105c4ae889e711fd'
James Almer [Tue, 3 Oct 2017 23:09:46 +0000 (20:09 -0300)]
Merge commit '248dc5c1646dcdd96fe79761105c4ae889e711fd'

* commit '248dc5c1646dcdd96fe79761105c4ae889e711fd':
  h264dec: fix dropped initial SEI recovery point

Merged-by: James Almer <jamrial@gmail.com>
23 months agolibavcodec/blockdsp : add AVX version
Martin Vignali [Sun, 1 Oct 2017 23:29:32 +0000 (01:29 +0200)]
libavcodec/blockdsp : add AVX version

Also modify the required alignment, to 32 instead of 16
for several codecs

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agolavf/mxfdec: Search all components of material track for source package.
Carl Eugen Hoyos [Sat, 5 Nov 2016 00:48:10 +0000 (01:48 +0100)]
lavf/mxfdec: Search all components of material track for source package.

Fixes ticket #5925.

Reviewed-by: Marton
23 months agofate: Add a test for latm-in-dvb auto-detection, ticket #6657.
Carl Eugen Hoyos [Sat, 30 Sep 2017 18:33:09 +0000 (20:33 +0200)]
fate: Add a test for latm-in-dvb auto-detection, ticket #6657.

23 months agoavcodec/proresdec2: Use LAST_SKIP_BITS where possible
Michael Niedermayer [Mon, 2 Oct 2017 02:18:23 +0000 (04:18 +0200)]
avcodec/proresdec2: Use LAST_SKIP_BITS where possible

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/proresdec2: SKIP_BITS() does not work with len=32
Michael Niedermayer [Mon, 2 Oct 2017 02:18:22 +0000 (04:18 +0200)]
avcodec/proresdec2: SKIP_BITS() does not work with len=32

Fixes: invalid shift
Fixes: 3482/clusterfuzz-testcase-minimized-5446915875405824

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/hevcdsp_template: Fix undefined shift
Michael Niedermayer [Mon, 2 Oct 2017 02:18:21 +0000 (04:18 +0200)]
avcodec/hevcdsp_template: Fix undefined shift

Fixes: runtime error: left shift of negative value -255
Fixes: 3373/clusterfuzz-testcase-minimized-5604083912146944

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/encode: do proper cleanup on failure
James Almer [Tue, 3 Oct 2017 14:49:18 +0000 (11:49 -0300)]
avcodec/encode: do proper cleanup on failure

Fixes the last remaining memleaks introduced by a22c6a4796ca1f2cbee6784262515da876fbec22.

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavformat/mxfenc: Fix labels for IEC PAL DV 420
Michael Niedermayer [Tue, 12 Sep 2017 20:17:12 +0000 (22:17 +0200)]
avformat/mxfenc: Fix labels for IEC PAL DV 420

23 months agoavformat/mxfenc: Add IEC DV25
Michael Niedermayer [Tue, 12 Sep 2017 19:20:02 +0000 (21:20 +0200)]
avformat/mxfenc: Add IEC DV25

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agobuild: fix compilation of tools with OpenCL enabled
James Almer [Tue, 3 Oct 2017 13:55:59 +0000 (10:55 -0300)]
build: fix compilation of tools with OpenCL enabled

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agofate: disable fate-svq3-2
James Almer [Tue, 3 Oct 2017 00:40:59 +0000 (21:40 -0300)]
fate: disable fate-svq3-2

The first frame changes depending on --enable-memory-poisoning being
used to configure ffmpeg or not, even if requesting bitexact decoding.
Disable the test until this is fixed.

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavcodec/encode: free non-referenced packets' side data in the old encode API functions
James Almer [Mon, 2 Oct 2017 21:58:39 +0000 (18:58 -0300)]
avcodec/encode: free non-referenced packets' side data in the old encode API functions

Fixes memleaks introduced by a22c6a4796ca1f2cbee6784262515da876fbec22.

23 months agoMerge commit '8e4d4efc67e154fdffd65964a7cfeef740320827'
James Almer [Mon, 2 Oct 2017 21:23:48 +0000 (18:23 -0300)]
Merge commit '8e4d4efc67e154fdffd65964a7cfeef740320827'

* commit '8e4d4efc67e154fdffd65964a7cfeef740320827':
  fate: Add another SVQ3 test to increase coverage

Also included a fix from da8093f712d625db7ce4a2526fb52994e01921ec.

The demuxer option "-ignore_editlist 1 " is temporarily added to the
test as well, to workaround a regression in the edit list mov parsing
code.

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'b8f66c0838b4c645227f23a35b4d54373da4c60a'
James Almer [Mon, 2 Oct 2017 19:13:01 +0000 (16:13 -0300)]
Merge commit 'b8f66c0838b4c645227f23a35b4d54373da4c60a'

* commit 'b8f66c0838b4c645227f23a35b4d54373da4c60a':
  aarch64: vp9itxfm: Reorder iadst16 coeffs
  arm: vp9itxfm: Reorder iadst16 coeffs
  aarch64: vp9itxfm: Reorder the idct coefficients for better pairing
  arm: vp9itxfm: Reorder the idct coefficients for better pairing
  aarch64: vp9itxfm: Avoid reloading the idct32 coefficients
  arm: vp9itxfm: Avoid reloading the idct32 coefficients
  arm: vp9lpf: Implement the mix2_44 function with one single filter pass
  aarch64: vp9lpf: Use dup+rev16+uzp1 instead of dup+lsr+dup+trn1
  arm/aarch64: vp9lpf: Keep the comparison to E within 8 bit

This commit is a noop, see
3fbbad29847c79f422128ad88f174c53a5f6c449
f32690a298badbf2df66319e9b38236ad3d3e321
a88db8b9a016fe47997029e3653cdac4777994b4
600f4c9b03b8d39b986a00dd9dafa61be7d86a72
2905657b902fea8718434f0d29056cf4e7434307
4f693b56bdcfda37b4f2c48b39dcf12439c149c8
f952273019984da5e7bfa1298e1cdb0683049296
b2e20d89844b51c3d9565b293606d1433bd67f25
26ee83acc4ebd765529b666c7f050243b7677d76

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'ed6a891c364f8b0850b557d9578b8920cc15a937'
James Almer [Mon, 2 Oct 2017 19:05:36 +0000 (16:05 -0300)]
Merge commit 'ed6a891c364f8b0850b557d9578b8920cc15a937'

* commit 'ed6a891c364f8b0850b557d9578b8920cc15a937':
  Place attribute_deprecated in the right position for struct declarations

This commit is a noop, see
99530387283fc58e6c3ac42724955b8569daf548
6ff3da4f6a8e460d77bb65fed4267bf48f513fcf

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8'
James Almer [Mon, 2 Oct 2017 19:00:14 +0000 (16:00 -0300)]
Merge commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8'

* commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8':
  mkv: Update the seek test to match 5d3953a5dc
  fate: Update fate-lavf-mkv after commit 5d3953a5dc

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab'
James Almer [Mon, 2 Oct 2017 18:52:18 +0000 (15:52 -0300)]
Merge commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab'

* commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab':
  fate: Add webp alpha test

This commit is a noop, see
bd2cec7021a0e275d4551a56d0a220ba2f9bd691
2bdb26b4eeec8142c927645a10b7f55cae5cdcc5
92bf87db294c0544168f572ba6739db7d2ba2ba3

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146'
James Almer [Mon, 2 Oct 2017 18:26:56 +0000 (15:26 -0300)]
Merge commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146'

* commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146':
  matroskaenc: factor ts_offset into block timecode computation

Merged-by: James Almer <jamrial@gmail.com>
23 months agoavdevice/decklink_dec: remove av_dup_packet() usage
James Almer [Mon, 2 Oct 2017 16:08:39 +0000 (13:08 -0300)]
avdevice/decklink_dec: remove av_dup_packet() usage

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavdevice/decklink_dec: use av_packet_add_side_data()
James Almer [Mon, 2 Oct 2017 02:31:12 +0000 (23:31 -0300)]
avdevice/decklink_dec: use av_packet_add_side_data()

It uses the existing buffer instead of allocating a new one.

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavcodec/encode: remove usage of av_dup_packet()
James Almer [Tue, 26 Sep 2017 03:24:29 +0000 (00:24 -0300)]
avcodec/encode: remove usage of av_dup_packet()

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavcodec/avpacket: deprecate av_copy_packet_side_data()
James Almer [Mon, 25 Sep 2017 20:17:12 +0000 (17:17 -0300)]
avcodec/avpacket: deprecate av_copy_packet_side_data()

It leaks memory and destroys the dst packet in case of failure, and it
ultimately duplicates functionality already existing in the saner
av_packet_copy_props().

Reviewed-by: wm4
Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524'
James Almer [Sun, 1 Oct 2017 21:21:02 +0000 (18:21 -0300)]
Merge commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524'

* commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524':
  build: Move cli tool sources to a separate subdirectory

Merged-by: James Almer <jamrial@gmail.com>
23 months agotools/ismindex: remove unused header
James Almer [Sun, 1 Oct 2017 21:19:14 +0000 (18:19 -0300)]
tools/ismindex: remove unused header

23 months agolibavcodec/exr : add x86 SIMD for predictor
Martin Vignali [Sun, 1 Oct 2017 19:37:15 +0000 (21:37 +0200)]
libavcodec/exr : add x86 SIMD for predictor

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agolavfi/vmafmotion: Allow more pix_fmts.
Carl Eugen Hoyos [Sat, 30 Sep 2017 19:39:08 +0000 (21:39 +0200)]
lavfi/vmafmotion: Allow more pix_fmts.

23 months agoavdevice/decklink_dec: Used av_parity instead of duplicated function
Karthick J [Fri, 29 Sep 2017 03:30:55 +0000 (09:00 +0530)]
avdevice/decklink_dec: Used av_parity instead of duplicated function

23 months agoPartially revert "Merge commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5'"
James Almer [Sun, 1 Oct 2017 15:57:48 +0000 (12:57 -0300)]
Partially revert "Merge commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5'"

Revert back to the test as done by commit af7a75cb517141f649cbbe0a9dcdb4854359b740,
where it was changed to compile and not just preprocess to fix build failures on
FreeBSD with gcc 4.7

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavfilter/vf_thumbnail_cuda: Avoid mixing declaration and statements
Michael Niedermayer [Fri, 29 Sep 2017 00:28:44 +0000 (02:28 +0200)]
avfilter/vf_thumbnail_cuda: Avoid mixing declaration and statements

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/v4l2_context: Reduce spelling variations
Michael Niedermayer [Fri, 29 Sep 2017 00:28:43 +0000 (02:28 +0200)]
avcodec/v4l2_context: Reduce spelling variations

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/v4l2_buffers: More clear return code documentation
Michael Niedermayer [Fri, 29 Sep 2017 00:28:42 +0000 (02:28 +0200)]
avcodec/v4l2_buffers: More clear return code documentation

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/jpeg2000: Check that codsty->log2_prec_widths/heights has been initialized
Michael Niedermayer [Mon, 4 Sep 2017 20:23:26 +0000 (22:23 +0200)]
avcodec/jpeg2000: Check that codsty->log2_prec_widths/heights has been initialized

Fixes: OOM
Fixes: 2225/clusterfuzz-testcase-minimized-5505632079708160

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agolavf/bit: Fix the G.729 bit auto-detection.
Carl Eugen Hoyos [Fri, 29 Sep 2017 17:10:46 +0000 (19:10 +0200)]
lavf/bit: Fix the G.729 bit auto-detection.

23 months agoavfilter/vmaf_motion: use correct header guards
James Almer [Sat, 30 Sep 2017 18:38:09 +0000 (15:38 -0300)]
avfilter/vmaf_motion: use correct header guards

Fixes fate-source

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavfilter: add vmafmotion filter
Ashish Singh [Fri, 15 Sep 2017 20:47:58 +0000 (02:17 +0530)]
avfilter: add vmafmotion filter

Signed-off-by: Ashish Singh <ashk43712@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
23 months agobuild: fix cleaning compiled unstripped examples
James Almer [Sat, 30 Sep 2017 04:40:08 +0000 (01:40 -0300)]
build: fix cleaning compiled unstripped examples

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoMAINTAINERS: add myself to the general developers list
Jan Ekström [Fri, 29 Sep 2017 00:03:23 +0000 (03:03 +0300)]
MAINTAINERS: add myself to the general developers list

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoavcodec/hevc_sei: Support HEVC paired fields.
Brian Matherly [Thu, 28 Sep 2017 01:48:42 +0000 (20:48 -0500)]
avcodec/hevc_sei: Support HEVC paired fields.

Correctly set the interlaced_frame and top_field_first fields when pic_struct
indicates paired fields.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agobuild: add missing changes to ensure examples build with progs-suffix
James Almer [Fri, 29 Sep 2017 20:42:42 +0000 (17:42 -0300)]
build: add missing changes to ensure examples build with progs-suffix

23 months agoMerge commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640'
James Almer [Fri, 29 Sep 2017 20:09:46 +0000 (17:09 -0300)]
Merge commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640'

* commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640':
  build: Separate logic for building examples from that for building avtools

Merged-by: James Almer <jamrial@gmail.com>
23 months agobuild: don't call install with the -T option
James Almer [Fri, 29 Sep 2017 19:13:51 +0000 (16:13 -0300)]
build: don't call install with the -T option

It's not available on macOS.

Should fix a regression instroduced by b25d6290c67e193b91becab12e6c88df134cee81.

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit 'acb0dea27efff4b35796015b96570b59fd517078'
James Almer [Fri, 29 Sep 2017 18:09:19 +0000 (15:09 -0300)]
Merge commit 'acb0dea27efff4b35796015b96570b59fd517078'

* commit 'acb0dea27efff4b35796015b96570b59fd517078':
  build: Split logic for building examples off into a separate Makefile

We already have a Makefile in doc/examples, but it's separate from the build
system and meant to be installed as part of the documentation to help users
compile the installed .c example files.
Move it to Makefile.example to make place for the new build system Makefile.

Merged-by: James Almer <jamrial@gmail.com>
23 months agolavf/bit: Use pkt->size instead of a constant for G.729 frame size.
Carl Eugen Hoyos [Fri, 29 Sep 2017 16:46:44 +0000 (18:46 +0200)]
lavf/bit: Use pkt->size instead of a constant for G.729 frame size.

Makes the code more readable, the muxer may support variable bit-rate in the future.

23 months agolavf/bit: Only build the G.729 bit demuxer if requested.
Carl Eugen Hoyos [Fri, 29 Sep 2017 16:31:18 +0000 (18:31 +0200)]
lavf/bit: Only build the G.729 bit demuxer if requested.

Fix the condition for the G.729 bit muxer.

23 months agofate: increase fuzz for refcmp filter tests
Tobias Rapp [Thu, 28 Sep 2017 07:15:41 +0000 (09:15 +0200)]
fate: increase fuzz for refcmp filter tests

Should fix failing tests on GNU/kFreeBSD x86_32.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
23 months agoconfigure: fix enabling SDL2 without pkg-config
James Almer [Fri, 29 Sep 2017 00:34:38 +0000 (21:34 -0300)]
configure: fix enabling SDL2 without pkg-config

Regression since d81b34069e80cb04160689ef5a160b9aee858257.

Signed-off-by: James Almer <jamrial@gmail.com>
23 months agoavcodec/videotoolbox: add hevc support
Aman Gupta [Tue, 26 Sep 2017 18:30:28 +0000 (11:30 -0700)]
avcodec/videotoolbox: add hevc support

Signed-off-by: Aman Gupta <aman@tmm1.net>
23 months agoavcodec/hevc_ps: extract SPS fields required for hvcC construction
Aman Gupta [Wed, 27 Sep 2017 01:04:12 +0000 (18:04 -0700)]
avcodec/hevc_ps: extract SPS fields required for hvcC construction

Signed-off-by: Aman Gupta <aman@tmm1.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoMerge commit 'db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6'
James Almer [Thu, 28 Sep 2017 22:22:21 +0000 (19:22 -0300)]
Merge commit 'db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6'

* commit 'db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6':
  build: Avoid duplication in examples lists

See 1a88e84fd54fd7a9ae334e989a9805f11f327864

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f'
James Almer [Thu, 28 Sep 2017 22:08:37 +0000 (19:08 -0300)]
Merge commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f'

* commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f':
  build: Drop leftover reference to old EXAMPLES logic

Merged-by: James Almer <jamrial@gmail.com>
23 months agolavf/mov: Allow reading very large files.
Pablo Montilla [Thu, 28 Sep 2017 21:46:57 +0000 (23:46 +0200)]
lavf/mov: Allow reading very large files.

The Sample count in the time-to-sample table is defined as
32-bit unsigned integer by the QT specification.

Fixes ticket #6700.

23 months agoopus_pvq: make max_den a float
Rostislav Pehlivanov [Thu, 28 Sep 2017 21:39:36 +0000 (22:39 +0100)]
opus_pvq: make max_den a float

Prevents int->float conversions on every loop.
Performance gain on synthetic benchmarks: 13%.
Suggested by kamedo2.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
23 months agoMerge commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7'
James Almer [Thu, 28 Sep 2017 21:36:27 +0000 (18:36 -0300)]
Merge commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7'

* commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7':
  configure: Restructure the way check_pkg_config() operates

Merged-by: James Almer <jamrial@gmail.com>
23 months agoavcodec/decode: Pass on the Closed Captions Side Data
Karthick J [Thu, 31 Aug 2017 11:10:05 +0000 (16:40 +0530)]
avcodec/decode: Pass on the Closed Captions Side Data

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agoavdevice/decklink_dec: Added Closed caption decode from VANC
Karthick J [Wed, 30 Aug 2017 06:13:16 +0000 (11:43 +0530)]
avdevice/decklink_dec: Added Closed caption decode from VANC

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agoavdevice/decklink_dec: Extraction of luma from V210 VANC modularized
Karthick J [Wed, 30 Aug 2017 04:51:00 +0000 (10:21 +0530)]
avdevice/decklink_dec: Extraction of luma from V210 VANC modularized

In preparation to support multiple VANC data decode

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agoavdevice/decklink_dec: Added VANC search for all resolutions
Karthick J [Tue, 29 Aug 2017 11:09:28 +0000 (16:39 +0530)]
avdevice/decklink_dec: Added VANC search for all resolutions

In preparation to make VANC decode modular, to support multiple other VANC data.

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agoavdevice/decklink_dec: add support for more pixel formats
Gildas Fargeas [Thu, 7 Sep 2017 12:46:31 +0000 (14:46 +0200)]
avdevice/decklink_dec: add support for more pixel formats

The decklink input pixel format can now be specified with the 'raw_format'
option. The -bm_v210 option is now deprecated.

Signed-off-by: Marton Balint <cus@passwd.hu>
23 months agoMerge commit '54e39b102e29adcc2f59f1eca85be5f86c89454b'
James Almer [Thu, 28 Sep 2017 16:46:31 +0000 (13:46 -0300)]
Merge commit '54e39b102e29adcc2f59f1eca85be5f86c89454b'

* commit '54e39b102e29adcc2f59f1eca85be5f86c89454b':
  configure: Explicitly spell out first require_pkg_config() parameter

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '00b160af117b782292619c98effce6c8273792e5'
James Almer [Thu, 28 Sep 2017 16:42:20 +0000 (13:42 -0300)]
Merge commit '00b160af117b782292619c98effce6c8273792e5'

* commit '00b160af117b782292619c98effce6c8273792e5':
  nvenc: Fix nvec vs. nvenc typo

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63'
James Almer [Thu, 28 Sep 2017 16:25:54 +0000 (13:25 -0300)]
Merge commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63'

* commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63':
  dv: Don't return EIO upon EOF

This commit is a noop, see 3eae98c1ac705d3f820a1800e81960146a80c61c

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '7cb9296db872c4221453e5411f242ebcfca62664'
James Almer [Thu, 28 Sep 2017 16:21:34 +0000 (13:21 -0300)]
Merge commit '7cb9296db872c4221453e5411f242ebcfca62664'

* commit '7cb9296db872c4221453e5411f242ebcfca62664':
  webp: Fix alpha decoding

This commit is a noop.

[13:09:40] <jamrial> jkqxz: do we need 7cb9296db8 from libav?
[13:11:20] <+wm4> we had vaapi vp8 for a while in ffmpeg, so I guess not
[13:11:58] <@jkqxz> It's more fallout from the VP8 hwaccel which never got merged. Some people hated on that part of the patch and I wasn't really interested in pursuing it further.
[13:13:02] <jamrial> it wasn't merged?
[13:13:21] <@jkqxz> wm4:  There is no VP8 decode hwaccel in ffmpeg (there is encode).
[13:13:25] <+wm4> ah
[13:14:00] <jamrial> what do i do then? and shouldn't that be merged at some point?
[13:14:37] <@jkqxz> It should.
[13:14:53] <@jkqxz> Skip the patch now, though.
[13:16:30] <jamrial> ok, thanks

Merged-by: James Almer <jamrial@gmail.com>
23 months agomovenc-test: Add tests for negative cts offsets
Martin Storsjö [Sat, 23 Sep 2017 15:44:45 +0000 (18:44 +0300)]
movenc-test: Add tests for negative cts offsets

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agomovenc: Add an option for enabling negative CTS offsets
Martin Storsjö [Mon, 25 Sep 2017 23:55:30 +0000 (02:55 +0300)]
movenc: Add an option for enabling negative CTS offsets

This reduces the need for an edit list; streams that start with
e.g. dts=-1, pts=0 can be encoded as dts=0, pts=0 (which is valid
in mov/mp4) by shifting the dts values of all packets forward.
This avoids the need for edit lists for such streams (while they
still are needed for audio streams with encoder delay).

This eases conformance with the DASH-IF interoperability guidelines.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
23 months agoMerge commit '2d518aec4c781316092be65893b47922c8f71b67'
James Almer [Thu, 28 Sep 2017 16:03:58 +0000 (13:03 -0300)]
Merge commit '2d518aec4c781316092be65893b47922c8f71b67'

* commit '2d518aec4c781316092be65893b47922c8f71b67':
  vf_deinterlace_vaapi: Create filter buffer after context
  vaapi_encode: Discard output buffer if picture submission fails

This commit is a noop, see
92bd08974541611731b2d58723826ea26ecbe47d
359586f14f46bf3f9c1ae3375d80e8c0fc377bef

Merged-by: James Almer <jamrial@gmail.com>
23 months agoMerge commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d'
James Almer [Thu, 28 Sep 2017 15:53:42 +0000 (12:53 -0300)]
Merge commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d'

* commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d':
  vf_fade: Make sure to not miss the last lines of a frame

This commit is a noop.

[11:00:43] <jamrial> michaelni: what do you think of 8f5de34c8f? does it apply to us?
[11:01:50] <jamrial> our code started to deviate with your commit bca59d7745e, followed by the merge commit aa40df483b2
[11:33:51] <michaelni> jamrial, the fade commits are from 2013, but i think our fixes where complete and the problematic slice_h FFALIGN is also removed

Merged-by: James Almer <jamrial@gmail.com>