ffmpeg.git
20 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>
20 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>
20 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>
20 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>
20 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.

20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 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>
20 months agoMerge commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6'
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>
20 months agoMerge commit '8847eeaa141898850381400000fb2b8a7adc7100'
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>
20 months agoMerge commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53'
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>
20 months agoavcodec/libopenh264dec: check for ff_set_dimensions() return value
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>
20 months agoMerge commit '030de53e9cc225dc767458aedcc87efd457b4f3b'
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>
20 months agoMerge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89'
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>
20 months agoMerge commit '871b4f3654636ed64560e86b9faa33828d195ceb'
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>
20 months agoMerge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'
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>
20 months agoMerge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'
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>
20 months agoMerge commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894'
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>
20 months agoMerge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'
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>
20 months agoMerge commit '07b5136c481d394992c7e951967df0cfbb346c0b'
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>
20 months agodoc/libav-merge: mention skipped or incomplete runtime alignment commits
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>
20 months agoMerge commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b'
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>
20 months agoMerge commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08'
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>
20 months agoMerge commit '0ee78020cd41d81eec651acd7fc65906207796f3'
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>
20 months agoMerge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'
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>
20 months agoMerge commit '04f3bd349651694f30feeb8c4ed9bc58106fca54'
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>
20 months agoMerge commit '4de220d2e3751c459f8739a08ac6ca52e63eba30'
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>
20 months agoMerge commit 'f44ec22e095c5ba00ffeadd891655c456e3dd014'
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>
20 months agoavutil/cpu: split flag checks per arch in av_cpu_max_align()
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>
20 months agoMerge commit 'e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e'
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>
20 months agoMerge commit '5c8a5765dc5f4e29afb85b95be393c30f45412a8'
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>
20 months agoMerge commit '6f554521afdf7ab4edbfaa9536660a1dca946b19'
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>
20 months agoMerge commit '435cd7bc99671bf561193421a50ac6e9d63c4266'
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>
20 months agoMerge commit '53ea595eec984e3109310e8bb7ff4b5786d91057'
James Almer [Wed, 27 Sep 2017 23:42:39 +0000 (20:42 -0300)]
Merge commit '53ea595eec984e3109310e8bb7ff4b5786d91057'

* commit '53ea595eec984e3109310e8bb7ff4b5786d91057':
  mov: Rework stsc index validation

See e26e6240b6700c5e8c16d0f092f1ad46805a723c.

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'
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>
20 months agoMerge commit 'b6093e8c72a80710f086c678ab0730cf30953b5c'
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>
20 months agoMerge commit 'bc2589763042dc2384b724b203ec778f35bcebad'
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>
20 months agoMerge commit 'a52976c0feab6e86138983c248bd01fa45cdda69'
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>
20 months agoMerge commit '77c23704c769168e4210956314775a1931f6aa0b'
James Almer [Wed, 27 Sep 2017 23:26:57 +0000 (20:26 -0300)]
Merge commit '77c23704c769168e4210956314775a1931f6aa0b'

* commit '77c23704c769168e4210956314775a1931f6aa0b':
  avcodec: Mark some codecs with threadsafe init as such

This commit is a noop, see 91ed4e71967f19824237de4c374f038b543c7555

Merged-by: James Almer <jamrial@gmail.com>
20 months agolavc: Move V4L2 encoders lower in the list
Mark Thompson [Wed, 27 Sep 2017 22:34:06 +0000 (23:34 +0100)]
lavc: Move V4L2 encoders lower in the list

Their previous positioning would cause them to chosen before software
encoders like libx264 or libvpx.

20 months agoMerge commit '0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32'
James Almer [Wed, 27 Sep 2017 22:37:15 +0000 (19:37 -0300)]
Merge commit '0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32'

* commit '0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32':
  aarch64: vp9itxfm: Fix incorrect vertical alignment
  aarch64: vp9itxfm: Update a comment to refer to a register with a different name
  aarch64: vp9itxfm: Use the right lane sizes in 8x8 for improved readability
  aarch64: vp9itxfm: Use a single lane ld1 instead of ld1r where possible
  aarch64: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
  arm: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
  aarch64: vp9itxfm: Do separate functions for half/quarter idct16 and idct32
  arm: vp9itxfm: Do a simpler half/quarter idct16/idct32 when possible
  aarch64: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
  arm: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
  aarch64: vp9itxfm: Make the larger core transforms standalone functions
  arm: vp9itxfm: Make the larger core transforms standalone functions

This commit is a noop, see
f8fcee0daf42d16581ec581bd5ff6373c3a76103
dc47bf3872fde18f6aea33f015a95b70e24dff19
3bd9b39108076e1fca8cd26970cb946fce66523a
a681c793a30386d01d273ce86b3368311cffb511
824589556cb7c4bfafb8a0190e71a10c628f5339
9532a7d4d060f2a2741225a76945daed52dbc478
1d8ab576a7e40ea6209dd753929f26dcb37e1444
3006e5253afc6a0ee001916806aae80f157d7043
19a0f9529ccdb48696f0caa251fe36b1d30df739
6752318c737663f0ac019de3acd63e3cea706864
d0fbf7f34e7243f6a4cbde9925f34d924e6d93f7
16ef000799b227d0226b7a678d28c34ff1d09410

Merged-by: James Almer <jamrial@gmail.com>
20 months agolavc/v4l2: Add missing header include
Mark Thompson [Wed, 27 Sep 2017 22:06:49 +0000 (23:06 +0100)]
lavc/v4l2: Add missing header include

Fixes checkheaders.

20 months agoMerge commit 'c546147db07d16a76c2fb698d2e8a3057f393475'
James Almer [Wed, 27 Sep 2017 22:08:19 +0000 (19:08 -0300)]
Merge commit 'c546147db07d16a76c2fb698d2e8a3057f393475'

* commit 'c546147db07d16a76c2fb698d2e8a3057f393475':
  configure: Correctly recurse in do_check_deps()

See 7659f35638e2ca7a8b202cb3007ca5473b108fa4.

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '57ec83e4246b21c2f0c068b9151d806737d4497f'
James Almer [Wed, 27 Sep 2017 22:06:12 +0000 (19:06 -0300)]
Merge commit '57ec83e4246b21c2f0c068b9151d806737d4497f'

* commit '57ec83e4246b21c2f0c068b9151d806737d4497f':
  omx: Use the EOS flag to handle flushing at the end

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491'
James Almer [Wed, 27 Sep 2017 21:56:08 +0000 (18:56 -0300)]
Merge commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491'

* commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491':
  configure: Rework dependency handling for conflicting components

Includes an important fix made by c546147db07d16a76c2fb698d2e8a3057f393475
as well.

Merged-by: James Almer <jamrial@gmail.com>
20 months agolavc: Add support for RockChip Media Process Platform
Lionel CHAZALLON [Sun, 24 Sep 2017 05:39:45 +0000 (05:39 +0000)]
lavc: Add support for RockChip Media Process Platform

This adds hardware decoding for H.264 / HEVC / VP8 / VP9 using the MPP
Rockchip API.  It returns frames holding an AVDRMFrameDescriptor struct
in buf[0] that allows drm / dmabuf usage.  Tested on RK3288 (TinkerBoard)
and RK3328.

Signed-off-by: Mark Thompson <sw@jkqxz.net>
20 months agoMerge commit '9127ac5ebc941d5e54828a91e5072c876be8ec42'
James Almer [Wed, 27 Sep 2017 19:45:32 +0000 (16:45 -0300)]
Merge commit '9127ac5ebc941d5e54828a91e5072c876be8ec42'

* commit '9127ac5ebc941d5e54828a91e5072c876be8ec42':
  configure: Add name parameter to require_pkg_config() helper function

Merged-by: James Almer <jamrial@gmail.com>
20 months agoavcodec/mips: Improve avc put mc 20, 01 and 03 msa functions
Kaustubh Raste [Tue, 26 Sep 2017 07:50:23 +0000 (13:20 +0530)]
avcodec/mips: Improve avc put mc 20, 01 and 03 msa functions

Remove loops and unroll as block sizes are known.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
20 months agoavcodec/mips: Improve avc chroma vert mc msa functions
Kaustubh Raste [Tue, 26 Sep 2017 05:26:27 +0000 (10:56 +0530)]
avcodec/mips: Improve avc chroma vert mc msa functions

Replace generic with block size specific function.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
20 months agoavcodec/mips: Improve avc weighted mc msa functions
Kaustubh Raste [Tue, 26 Sep 2017 05:21:12 +0000 (10:51 +0530)]
avcodec/mips: Improve avc weighted mc msa functions

Replace generic with block size specific function.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
20 months agoavcodec/mips: Removed generic function call in avc intra msa functions
Kaustubh Raste [Tue, 26 Sep 2017 05:10:14 +0000 (10:40 +0530)]
avcodec/mips: Removed generic function call in avc intra msa functions

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
20 months agoavcodec/mips: preload data in hevc sao edge 45 degree filter msa functions
Kaustubh Raste [Mon, 25 Sep 2017 12:38:35 +0000 (18:08 +0530)]
avcodec/mips: preload data in hevc sao edge 45 degree filter msa functions

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
20 months agoRevert "Merge commit 'a97563c889fefd81ad6b3758471434d8c2e2e550'"
James Almer [Wed, 27 Sep 2017 18:01:58 +0000 (15:01 -0300)]
Revert "Merge commit 'a97563c889fefd81ad6b3758471434d8c2e2e550'"

This reverts commit 1985071e41f4df8fc693a564e25758676bba164a, reversing
changes made to a901869c19ed14c7d3647901468bd1297c9f98c0.

We autodetect libxcb, so this is not necessary.

20 months agolavf/version: Bump minor after dv1394 removal.
Carl Eugen Hoyos [Wed, 27 Sep 2017 17:48:26 +0000 (19:48 +0200)]
lavf/version: Bump minor after dv1394 removal.

20 months agolavd: remove deprecated dv1394 device
Josh de Kock [Tue, 26 Sep 2017 14:49:18 +0000 (15:49 +0100)]
lavd: remove deprecated dv1394 device

Support for this device has been removed in kernel since v2.6.37. dv1394 has been superseded by libiec61883 which is functionally equivalent.

Signed-off-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
20 months agoMerge commit 'a25dac976a4478331e4db86d44c3db4456c93eff'
James Almer [Wed, 27 Sep 2017 15:46:57 +0000 (12:46 -0300)]
Merge commit 'a25dac976a4478331e4db86d44c3db4456c93eff'

* commit 'a25dac976a4478331e4db86d44c3db4456c93eff':
  Use bitstream_init8() where appropriate

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

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5'
James Almer [Wed, 27 Sep 2017 15:23:50 +0000 (12:23 -0300)]
Merge commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5'

* commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5':
  configure: Use cppflags check helper functions where appropriate

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '0ce3761c781f2c2de40a5a8a99563878804f47cc'
James Almer [Wed, 27 Sep 2017 14:54:11 +0000 (11:54 -0300)]
Merge commit '0ce3761c781f2c2de40a5a8a99563878804f47cc'

* commit '0ce3761c781f2c2de40a5a8a99563878804f47cc':
  configure: Add stdlib.h #include to CPPFLAGS check helper functions

Merged-by: James Almer <jamrial@gmail.com>
20 months agofate: add tests for psnr and ssim filter
Tobias Rapp [Tue, 29 Aug 2017 12:45:13 +0000 (14:45 +0200)]
fate: add tests for psnr and ssim filter

Metadata filter output is passed through an Awk script comparing floats
against reference values with specified "fuzz" tolerance to account for
architectural differences (e.g. x86-32 vs. x86-64).

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
20 months agoavfilter/f_metadata: avoid trailing whitespace in filter output
Tobias Rapp [Wed, 27 Sep 2017 12:29:21 +0000 (14:29 +0200)]
avfilter/f_metadata: avoid trailing whitespace in filter output

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
20 months agoMerge commit 'f7ec7f546f0021d28da284b024416b916b61c974'
James Almer [Tue, 26 Sep 2017 22:18:56 +0000 (19:18 -0300)]
Merge commit 'f7ec7f546f0021d28da284b024416b916b61c974'

* commit 'f7ec7f546f0021d28da284b024416b916b61c974':
  wma: 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>
20 months agoMerge commit '58d87e0f49bcbbc6f426328f53b657bae7430cd2'
James Almer [Tue, 26 Sep 2017 22:15:54 +0000 (19:15 -0300)]
Merge commit '58d87e0f49bcbbc6f426328f53b657bae7430cd2'

* commit '58d87e0f49bcbbc6f426328f53b657bae7430cd2':
  aarch64: vp9itxfm: Restructure the idct32 store macros
  arm: vp9itxfm: Avoid .irp when it doesn't save any lines

This commit is a noop, see
31e41350d283febda7e91b92555854ca270e075e
52c7366c83aba4dc92ceedecbee592d629c98e29

Merged-by: James Almer <jamrial@gmail.com>
20 months agoRevert "Merge commit '66988320794a107f2a460eaa71dbd9fab8056842'"
James Almer [Tue, 26 Sep 2017 22:09:57 +0000 (19:09 -0300)]
Revert "Merge commit '66988320794a107f2a460eaa71dbd9fab8056842'"

This reverts commit 740e557d6eac3b579dfed53ed92ae70e2089c77c, reversing
changes made to 932e28b13e9ae29262dfd28419b700e03716e85e.

The commit apparently broke builds with shared libs, and "suggesting"
the use of external libraries that need to be explicitly enable has
dubious usefulness anyway.

20 months agoMerge commit '8e67039c6312ba520945f2c01b7b14df056d5ed1'
James Almer [Tue, 26 Sep 2017 21:50:30 +0000 (18:50 -0300)]
Merge commit '8e67039c6312ba520945f2c01b7b14df056d5ed1'

* commit '8e67039c6312ba520945f2c01b7b14df056d5ed1':
  asfdec: Use the ASF stream count when iterating

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '7abdd026df6a9a52d07d8174505b33cc89db7bf6'
James Almer [Tue, 26 Sep 2017 21:48:06 +0000 (18:48 -0300)]
Merge commit '7abdd026df6a9a52d07d8174505b33cc89db7bf6'

* commit '7abdd026df6a9a52d07d8174505b33cc89db7bf6':
  asm: Consistently uppercase SECTION markers

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '740b0bf03b4bb8b0a0e964750817ac0363a33c55'
James Almer [Tue, 26 Sep 2017 21:38:14 +0000 (18:38 -0300)]
Merge commit '740b0bf03b4bb8b0a0e964750817ac0363a33c55'

* commit '740b0bf03b4bb8b0a0e964750817ac0363a33c55':
  build: Ignore generated .version files

This commit is a noop, see fbc304239fe6162d8da4ee7a519483f5ef79e7c2

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '15a92e0c402c830b607f905d6bf203b6cfb4fa8c'
James Almer [Tue, 26 Sep 2017 21:34:25 +0000 (18:34 -0300)]
Merge commit '15a92e0c402c830b607f905d6bf203b6cfb4fa8c'

* commit '15a92e0c402c830b607f905d6bf203b6cfb4fa8c':
  rtmp: Correctly handle the Window Acknowledgement Size packets

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'a1a143adb0fd11c474221431417cff25db7d920f'
James Almer [Tue, 26 Sep 2017 21:08:25 +0000 (18:08 -0300)]
Merge commit 'a1a143adb0fd11c474221431417cff25db7d920f'

* commit 'a1a143adb0fd11c474221431417cff25db7d920f':
  rtmp: Rename packet types to closer match the spec

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'bcaedef1189a3531aa4dfb020627eb0133ffa89c'
James Almer [Tue, 26 Sep 2017 20:42:19 +0000 (17:42 -0300)]
Merge commit 'bcaedef1189a3531aa4dfb020627eb0133ffa89c'

* commit 'bcaedef1189a3531aa4dfb020627eb0133ffa89c':
  configure: Add require_cpp_condition() convenience function

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'aba7fdcc8baaed35e804c7882b70a848a0e566c7'
James Almer [Tue, 26 Sep 2017 20:29:57 +0000 (17:29 -0300)]
Merge commit 'aba7fdcc8baaed35e804c7882b70a848a0e566c7'

* commit 'aba7fdcc8baaed35e804c7882b70a848a0e566c7':
  configure: Add require_header() convenience function

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'a97563c889fefd81ad6b3758471434d8c2e2e550'
James Almer [Tue, 26 Sep 2017 20:23:16 +0000 (17:23 -0300)]
Merge commit 'a97563c889fefd81ad6b3758471434d8c2e2e550'

* commit 'a97563c889fefd81ad6b3758471434d8c2e2e550':
  configure: Simplify libxcb check

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068'
James Almer [Tue, 26 Sep 2017 20:13:46 +0000 (17:13 -0300)]
Merge commit 'c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068'

* commit 'c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068':
  svq3: 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>
20 months agoMerge commit 'acfa7a2178f08fd81b66279959cd55ec3ae237e2'
James Almer [Tue, 26 Sep 2017 20:11:48 +0000 (17:11 -0300)]
Merge commit 'acfa7a2178f08fd81b66279959cd55ec3ae237e2'

* commit 'acfa7a2178f08fd81b66279959cd55ec3ae237e2':
  configure: Drop weak dependencies on external libraries for webm muxer

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '66988320794a107f2a460eaa71dbd9fab8056842'
James Almer [Tue, 26 Sep 2017 20:08:29 +0000 (17:08 -0300)]
Merge commit '66988320794a107f2a460eaa71dbd9fab8056842'

* commit '66988320794a107f2a460eaa71dbd9fab8056842':
  configure: Add proper weak dependency of drawtext filter on libfontconfig

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '24d5680bbc01fc124709d522d348572ad4672563'
James Almer [Tue, 26 Sep 2017 20:01:21 +0000 (17:01 -0300)]
Merge commit '24d5680bbc01fc124709d522d348572ad4672563'

* commit '24d5680bbc01fc124709d522d348572ad4672563':
  configure: Simplify inline asm check with appropriate helper function

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'b3825723dceffc64240da7b0e562bd1fd024da26'
James Almer [Tue, 26 Sep 2017 19:49:59 +0000 (16:49 -0300)]
Merge commit 'b3825723dceffc64240da7b0e562bd1fd024da26'

* commit 'b3825723dceffc64240da7b0e562bd1fd024da26':
  configure: Merge compiler/libc/os hacks sections

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '577326d430593a25456393a75212b95d1cd94131'
James Almer [Tue, 26 Sep 2017 19:38:55 +0000 (16:38 -0300)]
Merge commit '577326d430593a25456393a75212b95d1cd94131'

* commit '577326d430593a25456393a75212b95d1cd94131':
  lavc: deprecate refcounted_frames field

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '3ad825793a43253154bed05827f27425fc0757df'
James Almer [Tue, 26 Sep 2017 19:27:43 +0000 (16:27 -0300)]
Merge commit '3ad825793a43253154bed05827f27425fc0757df'

* commit '3ad825793a43253154bed05827f27425fc0757df':
  hwcontext_cuda: implement frames_get_constraints

This commit is a noop, c16fe1432d88f87a96be9e943e0f1229543ad61d

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'
James Almer [Tue, 26 Sep 2017 18:58:40 +0000 (15:58 -0300)]
Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'

* commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3':
  Mark some arrays that never change as const.

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'b420a27e74750b60d2e064236afb10be06a38ace'
James Almer [Tue, 26 Sep 2017 18:44:19 +0000 (15:44 -0300)]
Merge commit 'b420a27e74750b60d2e064236afb10be06a38ace'

* commit 'b420a27e74750b60d2e064236afb10be06a38ace':
  avconv: allow -b to be used with streamcopy

This commit is a noop. We already have this functionality.

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192'
James Almer [Tue, 26 Sep 2017 18:06:10 +0000 (15:06 -0300)]
Merge commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192'

* commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192':
  ffv1: Convert to the new bitstream reader
  h261dec: Convert to the new bitstream reader
  shorten: Convert to the new bitstream reader
  ralf: Convert to the new bitstream reader
  loco: Convert to the new bitstream reader
  fic: Convert to the new bitstream reader
  dirac: Convert to the new bitstream reader
  cavs: Convert to the new bitstream reader
  aic: Convert to the new bitstream reader
  golomb: 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>
20 months agoMerge commit 'ab87af41636b081dd3562423999351b5444fa09e'
James Almer [Tue, 26 Sep 2017 18:03:21 +0000 (15:03 -0300)]
Merge commit 'ab87af41636b081dd3562423999351b5444fa09e'

* commit 'ab87af41636b081dd3562423999351b5444fa09e':
  configure: Add proper weak dependency of avformat on network

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '612cc0712836af2f025b0c68b11da29b9f259d5a'
James Almer [Tue, 26 Sep 2017 17:59:58 +0000 (14:59 -0300)]
Merge commit '612cc0712836af2f025b0c68b11da29b9f259d5a'

* commit '612cc0712836af2f025b0c68b11da29b9f259d5a':
  pgssubdec: reset rle_data_len/rle_remaining_len on allocation error

This commit is a noop, see 842e98b4d83d8cf297e2bc2761f1f47eb89e49e4

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit '708e84cda1bdbffb92847f3d6ccf6fbeb26d9948'
James Almer [Tue, 26 Sep 2017 17:48:22 +0000 (14:48 -0300)]
Merge commit '708e84cda1bdbffb92847f3d6ccf6fbeb26d9948'

* commit '708e84cda1bdbffb92847f3d6ccf6fbeb26d9948':
  mov: Avoid memcmp of uninitialised data

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c'
James Almer [Tue, 26 Sep 2017 17:43:29 +0000 (14:43 -0300)]
Merge commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c'

* commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c':
  vaapi_encode: Add VP8 support
  vaapi_encode: Pass framerate parameters to driver
  vaapi_h264: Enable VBR mode
  vaapi_encode: Support VBR mode

This commit is a noop, see
ceb28c3cc4c7921935b48904db3c559eed1597fe
2201c02e6dc9f9652a8e27dec194915f05954ad0
be6546a4ff592785d039df6cbdd7659781d30b2c
d1acab8293054151157910eb081d5edcc7496e13

Merged-by: James Almer <jamrial@gmail.com>
20 months agoMerge commit 'c5c663541739cb813a2a5668ee8339b535b35d7d'
Rodger Combs [Tue, 26 Sep 2017 17:13:54 +0000 (14:13 -0300)]
Merge commit 'c5c663541739cb813a2a5668ee8339b535b35d7d'

* commit 'c5c663541739cb813a2a5668ee8339b535b35d7d':
  doc: add dash muxer

Merged-by: Rodger Combs <rodger.combs@gmail.com>
20 months agoMerge commit '7295b7373862ee54903b33d6ef3335531dfa93ad'
Rodger Combs [Tue, 26 Sep 2017 17:13:09 +0000 (14:13 -0300)]
Merge commit '7295b7373862ee54903b33d6ef3335531dfa93ad'

* commit '7295b7373862ee54903b33d6ef3335531dfa93ad':
  dashenc: add webm support

Merged-by: Rodger Combs <rodger.combs@gmail.com>
20 months agoMerge commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7'
Rodger Combs [Tue, 26 Sep 2017 17:12:19 +0000 (14:12 -0300)]
Merge commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7'

* commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7':
  dashenc: use avio_dynbuf instead of packet_write callback

Merged-by: Rodger Combs <rodger.combs@gmail.com>