]>
git.sesse.net Git - ffmpeg/log
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>
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>
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>
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>
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>
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
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.
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>
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>
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>
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>
Michael Niedermayer [Tue, 12 Sep 2017 20:17:12 +0000 (22:17 +0200)]
avformat/mxfenc: Fix labels for IEC PAL DV 420
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>
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>
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>
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 .
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>
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>
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>
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>
James Almer [Mon, 2 Oct 2017 18:52:18 +0000 (15:52 -0300)]
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>
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>
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>
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>
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>
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>
James Almer [Sun, 1 Oct 2017 21:19:14 +0000 (18:19 -0300)]
tools/ismindex: remove unused header
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>
Carl Eugen Hoyos [Sat, 30 Sep 2017 19:39:08 +0000 (21:39 +0200)]
lavfi/vmafmotion: Allow more pix_fmts.
Karthick J [Fri, 29 Sep 2017 03:30:55 +0000 (09:00 +0530)]
avdevice/decklink_dec: Used av_parity instead of duplicated function
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>
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>
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>
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>
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>
Carl Eugen Hoyos [Fri, 29 Sep 2017 17:10:46 +0000 (19:10 +0200)]
lavf/bit: Fix the G.729 bit auto-detection.
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>
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>
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>
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>
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>
James Almer [Fri, 29 Sep 2017 20:42:42 +0000 (17:42 -0300)]
build: add missing changes to ensure examples build with progs-suffix
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>
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>
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>
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.
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.
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>
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>
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>
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>
James Almer [Thu, 28 Sep 2017 22:22:21 +0000 (19:22 -0300)]
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
James Almer [Thu, 28 Sep 2017 04:04:46 +0000 (01:04 -0300)]
Merge commit '
d00a0d8e84fef1b9124bfaf71cc17df79ca464a6 '
* commit '
d00a0d8e84fef1b9124bfaf71cc17df79ca464a6 ':
configure: Handle SDL version check through pkg-config
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:53:40 +0000 (00:53 -0300)]
Merge commit '
8847eeaa141898850381400000fb2b8a7adc7100 '
* commit '
8847eeaa141898850381400000fb2b8a7adc7100 ':
aarch64: Add parentheses around the offset parameter in movrel
This commit is a noop, see
dda45c087b2c09ba9e485c51ff9c8f2aaca709a9
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:52:02 +0000 (00:52 -0300)]
Merge commit '
82989bd98c7f4e87f59af2147b645b8fd8f31c53 '
* commit '
82989bd98c7f4e87f59af2147b645b8fd8f31c53 ':
avconv: Move rescale to stream timebase before monotonisation
This commit is a noop, see
4ee5aed122ba7d289c1686eca6eba161d5d62304
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:49:05 +0000 (00:49 -0300)]
avcodec/libopenh264dec: check for ff_set_dimensions() return value
Was removed by accident in
e9b6212de29a966f200833220ed35f51852f05f6 .
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:44:11 +0000 (00:44 -0300)]
Merge commit '
030de53e9cc225dc767458aedcc87efd457b4f3b '
* commit '
030de53e9cc225dc767458aedcc87efd457b4f3b ':
libopenh264dec: Let the framework use the h264_mp4toannexb bitstream filter
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:18:10 +0000 (00:18 -0300)]
Merge commit '
0539d84d985e811e5989ef27c13f7e2dda0f9b89 '
* commit '
0539d84d985e811e5989ef27c13f7e2dda0f9b89 ':
asfdec: Account for different Format Data sizes
See
76853a3e0ce4d4ef09ffcca7307991b8db832cd4
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:13:10 +0000 (00:13 -0300)]
Merge commit '
871b4f3654636ed64560e86b9faa33828d195ceb '
* commit '
871b4f3654636ed64560e86b9faa33828d195ceb ':
configure: Check for xcb as well as xcb-shape before enabling libxcb
This commit is a noop. We already check for libxcb_shape.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:09:20 +0000 (00:09 -0300)]
Merge commit '
b446f0e98f85e2e931b476e52b319f1c49244660 '
* commit '
b446f0e98f85e2e931b476e52b319f1c49244660 ':
mov: Do not try to parse multiple stsd for the same track
See
8b43ee4054af799e388d380b379a13a60849c1b5
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:06:42 +0000 (00:06 -0300)]
Merge commit '
e791b915c774408fbc0ec9e7270b021899e08ccc '
* commit '
e791b915c774408fbc0ec9e7270b021899e08ccc ':
hwcontext_vaapi: Try to support the VDPAU wrapper
This commit is a noop, see
f2e4fb61af4b47c329fbf2b9a245594957d7bbab
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:05:24 +0000 (00:05 -0300)]
Merge commit '
5dd9a4b88b287bf8c93520afda7becb1ad0d1894 '
* commit '
5dd9a4b88b287bf8c93520afda7becb1ad0d1894 ':
vaapi: Implement device-only setup
This commit is a noop, see
81b7deab8296f8446a64e20b9fcaf8eba88b9e29
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:02:15 +0000 (00:02 -0300)]
Merge commit '
44f2eda39ff55c69d4d739fb12a42a10b7ce581c '
* commit '
44f2eda39ff55c69d4d739fb12a42a10b7ce581c ':
lavc: Add device context field to AVCodecContext
This commit is a noop, see
c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 03:00:23 +0000 (00:00 -0300)]
Merge commit '
07b5136c481d394992c7e951967df0cfbb346c0b '
* commit '
07b5136c481d394992c7e951967df0cfbb346c0b ':
aarch64: vp9lpf: Fix broken indentation/vertical alignment
aarch64: vp9lpf: Interleave the start of flat8in into the calculation above
arm: vp9lpf: Interleave the start of flat8in into the calculation above
This commit is a noop, see
83399cf569c9f78e0c72e21aa67184c222bb2d59
9f3a8863648ed19ea69ca5ddfcfa3c80e0df15b0
c8d6eec85d6a87c9075c87d5eb75af47c964fff8
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:57:30 +0000 (23:57 -0300)]
doc/libav-merge: mention skipped or incomplete runtime alignment commits
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:52:22 +0000 (23:52 -0300)]
Merge commit '
9c2d36fcaf8748b9baa9aba9264abefce711d67b '
* commit '
9c2d36fcaf8748b9baa9aba9264abefce711d67b ':
dv: Convert to the new bitstream reader
This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:48:40 +0000 (23:48 -0300)]
Merge commit '
ba30b74686f0cb6c9dd465ac4820059c48bf9d08 '
* commit '
ba30b74686f0cb6c9dd465ac4820059c48bf9d08 ':
aac: Validate the sbr sample rate before using the value
See
cf5f4c5169639349262aa221ae485a0de188afb1
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:41:24 +0000 (23:41 -0300)]
Merge commit '
0ee78020cd41d81eec651acd7fc65906207796f3 '
* commit '
0ee78020cd41d81eec651acd7fc65906207796f3 ':
configure: Move up the avbuild directory creation
This commit is a noop, see
19bf50406ebf8bff1be7388da2ed7a85738d055f
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:37:43 +0000 (23:37 -0300)]
Merge commit '
c2f97f050870897575570708ac48c5c15e6a0dd8 '
* commit '
c2f97f050870897575570708ac48c5c15e6a0dd8 ':
hwcontext_dxva2: support D3D9Ex
This commit is a noop, see
50708f4aa40ce96122cf93d9e36cca8024baf025
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:35:59 +0000 (23:35 -0300)]
Merge commit '
04f3bd349651694f30feeb8c4ed9bc58106fca54 '
* commit '
04f3bd349651694f30feeb8c4ed9bc58106fca54 ':
AVFrame: add an opaque_ref field
This commit is a noop, see
e3af49b14bf371e18fab1c12cba0239e6658672c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:29:20 +0000 (23:29 -0300)]
Merge commit '
4de220d2e3751c459f8739a08ac6ca52e63eba30 '
* commit '
4de220d2e3751c459f8739a08ac6ca52e63eba30 ':
frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:16:43 +0000 (23:16 -0300)]
Merge commit '
f44ec22e095c5ba00ffeadd891655c456e3dd014 '
* commit '
f44ec22e095c5ba00ffeadd891655c456e3dd014 ':
lavc: use av_cpu_max_align() instead of hardcoding alignment requirements
This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:10:09 +0000 (23:10 -0300)]
avutil/cpu: split flag checks per arch in av_cpu_max_align()
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 01:56:53 +0000 (22:56 -0300)]
Merge commit '
e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e '
* commit '
e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e ':
cpu: add a function for querying maximum required data alignment
Adapted to work with the arbitrary runtime cpuflag changes av_force_cpu_flags()
can generate.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:59:14 +0000 (20:59 -0300)]
Merge commit '
5c8a5765dc5f4e29afb85b95be393c30f45412a8 '
* commit '
5c8a5765dc5f4e29afb85b95be393c30f45412a8 ':
scale_npp: explicitly set the output frames context for passthrough mode
See
62b75537db15816fde8b8a33976ffc4a8277f1fc
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:55:46 +0000 (20:55 -0300)]
Merge commit '
6f554521afdf7ab4edbfaa9536660a1dca946b19 '
* commit '
6f554521afdf7ab4edbfaa9536660a1dca946b19 ':
Use the new AVIOContext destructor.
avio: add a destructor for AVIOContext
This commit is a noop, see
b12e4d3bb8df994f042ff1216fb8de2b967aab9e
78a7af823b7c2a1e3184e6680f2b49bf67101e5c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:51:29 +0000 (20:51 -0300)]
Merge commit '
435cd7bc99671bf561193421a50ac6e9d63c4266 '
* commit '
435cd7bc99671bf561193421a50ac6e9d63c4266 ':
arm: vp9lpf: Use orrs instead of orr+cmp
arm/aarch64: vp9lpf: Calculate !hev directly
aarch64: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
arm: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
aarch64: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
arm: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
aarch64: vp9mc: Simplify the extmla macro parameters
This commit is a noop, see
ac6cb8ae5b1c56c4a3fceb635c60d05e447c4365
bff07715904cc02f04eb5c5e171b431eb00f0c3b
045e33ae3fee74e39b1321dddf727eacb1ecf541
758302e4bc14e93989e7feb1135ec3f807c3310d
148cc0bb890839bc2a9cda514c5e71acc39eb374
f0ecbb13cf1cf706a1350dad657219dc7b3c131e
92ab8374b1051dd632c3ccc326b6cb1d564f293f
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:42:39 +0000 (20:42 -0300)]
James Almer [Wed, 27 Sep 2017 23:35:04 +0000 (20:35 -0300)]
Merge commit '
ce6d72d10776b03c6780d4aa676414ce002285d4 '
* commit '
ce6d72d10776b03c6780d4aa676414ce002285d4 ':
imgutils: Document av_image_get_buffer_size()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:33:41 +0000 (20:33 -0300)]
Merge commit '
b6093e8c72a80710f086c678ab0730cf30953b5c '
* commit '
b6093e8c72a80710f086c678ab0730cf30953b5c ':
hlsenc: Correctly write down all 16 bytes in hex
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:31:12 +0000 (20:31 -0300)]
Merge commit '
bc2589763042dc2384b724b203ec778f35bcebad '
* commit '
bc2589763042dc2384b724b203ec778f35bcebad ':
utvideodec: Add a missing include
This commit is a noop, see
91ed4e71967f19824237de4c374f038b543c7555
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:29:20 +0000 (20:29 -0300)]
Merge commit '
a52976c0feab6e86138983c248bd01fa45cdda69 '
* commit '
a52976c0feab6e86138983c248bd01fa45cdda69 ':
nvenc: make gpu indices independent of supported capabilities
This commit is a noop, see
5403d90f32656719a766254d77bbe4411e473eed
Merged-by: James Almer <jamrial@gmail.com>