ffmpeg.git
3 years agoMerge commit '3b08d9d932eef09403074d5af31e10d8011e840b'
Derek Buitenhuis [Thu, 21 Apr 2016 15:40:10 +0000 (16:40 +0100)]
Merge commit '3b08d9d932eef09403074d5af31e10d8011e840b'

* commit '3b08d9d932eef09403074d5af31e10d8011e840b':
  testprogs: K&R formatting cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
Derek Buitenhuis [Thu, 21 Apr 2016 15:04:10 +0000 (16:04 +0100)]
Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'

* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48':
  testprogs: Clean up #includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093'
Derek Buitenhuis [Thu, 21 Apr 2016 15:03:43 +0000 (16:03 +0100)]
Merge commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093'

* commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093':
  build: Drop redundant removal of compiled object files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'
Derek Buitenhuis [Thu, 21 Apr 2016 15:02:26 +0000 (16:02 +0100)]
Merge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'

* commit 'b298b36fc008ad94a24929fe770c8189d96bcac4':
  fate: Only run SRTP test if SRTP code is enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'
Derek Buitenhuis [Thu, 21 Apr 2016 15:01:47 +0000 (16:01 +0100)]
Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'

* commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2':
  unix: Use rw_timeout for setting the connect timeout

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0'
Derek Buitenhuis [Thu, 21 Apr 2016 15:01:26 +0000 (16:01 +0100)]
Merge commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0'

This commit is a no-op.

* commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0':
  tcp: Use rw_timeout for setting the connect/listen timeouts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'
Derek Buitenhuis [Thu, 21 Apr 2016 14:55:09 +0000 (15:55 +0100)]
Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'

* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
  avio: Copy URLContext generic options into child URLContexts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolibnut: Pass stream to ff_parse_specific_params
Derek Buitenhuis [Thu, 21 Apr 2016 14:21:09 +0000 (15:21 +0100)]
libnut: Pass stream to ff_parse_specific_params

This function bo longer takes an AVCodecContext.

Fixes ticket #5430.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolavf: use new decode API
wm4 [Tue, 22 Mar 2016 18:09:57 +0000 (19:09 +0100)]
lavf: use new decode API

From Libav commit 8bc4accc37ab047d2fd85d672c577b39dfc918e1, with
additional code for decoding subtitles (not present in Libav).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agolavc: introduce a new decoding/encoding API with decoupled input/output
wm4 [Tue, 22 Mar 2016 18:09:53 +0000 (19:09 +0100)]
lavc: introduce a new decoding/encoding API with decoupled input/output

Until now, the decoding API was restricted to outputting 0 or 1 frames
per input packet. It also enforces a somewhat rigid dataflow in general.

This new API seeks to relax these restrictions by decoupling input and
output. Instead of doing a single call on each decode step, which may
consume the packet and may produce output, the new API requires the user
to send input first, and then ask for output.

For now, there are no codecs supporting this API. The API can work with
codecs using the old API, and most code added here is to make them
interoperate. The reverse is not possible, although for audio it might.

From Libav commit 05f66706d182eb0c36af54d72614bf4c33e957a9.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 years agoavformat/utils: Remove use of caps_internal as it is not public API
Michael Niedermayer [Thu, 21 Apr 2016 11:35:22 +0000 (13:35 +0200)]
avformat/utils: Remove use of caps_internal as it is not public API

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()
Michael Niedermayer [Wed, 20 Apr 2016 17:19:25 +0000 (19:19 +0200)]
avcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()

With this the use of the caps_internal from libavformat can be avoided

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/avpacket: Fix off by 5 error
Michael Niedermayer [Wed, 20 Apr 2016 20:38:26 +0000 (22:38 +0200)]
avcodec/avpacket: Fix off by 5 error

Fixes out of array read
Fixes: mozilla bug 1266129
Found-by: Tyson Smith
Tested-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/takdec: add code that got somehow lost in process of REing
Paul B Mahol [Wed, 20 Apr 2016 20:45:05 +0000 (22:45 +0200)]
avcodec/takdec: add code that got somehow lost in process of REing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agox86inc: Enable AVX emulation in additional cases
Anton Mitrofanov [Thu, 7 Apr 2016 10:09:03 +0000 (13:09 +0300)]
x86inc: Enable AVX emulation in additional cases

Allows emulation to work when dst is equal to src2 as long as the
instruction is commutative, e.g. `addps m0, m1, m0`.

3 years agox86inc: Improve handling of %ifid with multi-token parameters
Anton Mitrofanov [Thu, 7 Apr 2016 09:48:29 +0000 (12:48 +0300)]
x86inc: Improve handling of %ifid with multi-token parameters

The yasm/nasm preprocessor only checks the first token, which means that
parameters such as `dword [rax]` are treated as identifiers, which is
generally not what we want.

3 years agox86inc: Fix AVX emulation of some instructions
Anton Mitrofanov [Mon, 28 Mar 2016 15:35:38 +0000 (18:35 +0300)]
x86inc: Fix AVX emulation of some instructions

3 years agox86inc: Fix AVX emulation of scalar float instructions
Henrik Gramner [Fri, 4 Mar 2016 16:51:41 +0000 (17:51 +0100)]
x86inc: Fix AVX emulation of scalar float instructions

Those instructions are not commutative since they only change the first
element in the vector and leave the rest unmodified.

3 years agofate: add readvitc filter test
Tobias Rapp [Thu, 7 Apr 2016 12:39:33 +0000 (14:39 +0200)]
fate: add readvitc filter test

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: Add test for ticket 1833 (Ogg/Vorbis Chapters)
Michael Niedermayer [Fri, 15 Apr 2016 00:30:12 +0000 (02:30 +0200)]
fate: Add test for ticket 1833 (Ogg/Vorbis Chapters)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: Add test for mts2 (mss4) codec
Petru Rares Sincraian [Tue, 19 Apr 2016 15:39:47 +0000 (17:39 +0200)]
fate: Add test for mts2 (mss4) codec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'
Derek Buitenhuis [Tue, 19 Apr 2016 18:17:50 +0000 (19:17 +0100)]
Merge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'

* commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0':
  opt: Add av_opt_copy()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '8833f1508b7b6afc3172a8017934a7a54428c686'
Derek Buitenhuis [Tue, 19 Apr 2016 13:43:23 +0000 (14:43 +0100)]
Merge commit '8833f1508b7b6afc3172a8017934a7a54428c686'

This commit is a no-op.

* commit '8833f1508b7b6afc3172a8017934a7a54428c686':
  opt: Add const to av_opt_next

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'
Derek Buitenhuis [Tue, 19 Apr 2016 13:41:19 +0000 (14:41 +0100)]
Merge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'

* commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310':
  file: Add an option for following a file that is being written

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavcodec/tak_parser: fix parsing of streams with bunch of small frames at end
Paul B Mahol [Mon, 18 Apr 2016 21:27:08 +0000 (23:27 +0200)]
avcodec/tak_parser: fix parsing of streams with bunch of small frames at end

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agofate: Add test for 012v codec
Petru Rares Sincraian [Mon, 18 Apr 2016 16:52:51 +0000 (18:52 +0200)]
fate: Add test for 012v codec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: Add test for mss1 codec
Petru Rares Sincraian [Mon, 18 Apr 2016 15:03:01 +0000 (17:03 +0200)]
fate: Add test for mss1 codec

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'ccea588f831906084b8c8235222920e6984beb72'
Derek Buitenhuis [Mon, 18 Apr 2016 14:47:05 +0000 (15:47 +0100)]
Merge commit 'ccea588f831906084b8c8235222920e6984beb72'

* commit 'ccea588f831906084b8c8235222920e6984beb72':
  avio: Add an option 'rw_timeout'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'
Derek Buitenhuis [Mon, 18 Apr 2016 14:35:12 +0000 (15:35 +0100)]
Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'

* commit 'd44f3e4059506a182f59218b1e967d42b01e097c':
  avio: Apply avoptions on the URLContext itself as well

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '8a02a8031ef4f98faf5647f0e01a8922247bf748'
Derek Buitenhuis [Mon, 18 Apr 2016 14:33:38 +0000 (15:33 +0100)]
Merge commit '8a02a8031ef4f98faf5647f0e01a8922247bf748'

* commit '8a02a8031ef4f98faf5647f0e01a8922247bf748':
  lavfi: add an NVIDIA NPP-based scaling filter

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'
Derek Buitenhuis [Mon, 18 Apr 2016 14:22:24 +0000 (15:22 +0100)]
Merge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'

* commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d':
  lavf: VAAPI scale filter

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'
Derek Buitenhuis [Mon, 18 Apr 2016 14:13:28 +0000 (15:13 +0100)]
Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'

This commit is a no-op. wm4 is working to get these into ffmpeg
proper, with ffmpeg versions of the patches.

* commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1':
  lavf: use new decode API
  avconv: use new encode API
  avconv: use new decode API
  lavc: introduce a new decoding/encoding API with decoupled input/output

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'
Derek Buitenhuis [Mon, 18 Apr 2016 14:00:13 +0000 (15:00 +0100)]
Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'

These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.

* commit '0d2fcdb1c5c9e844c232e5429130727121990d0e':
  opt-test: Merge struct declaration and initialization
  opt-test: Move some variable declarations to avoid block braces

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavcodec/dump_extradata_bsf: Add back 'k' and 'e' options
Michael Niedermayer [Mon, 18 Apr 2016 00:39:15 +0000 (02:39 +0200)]
avcodec/dump_extradata_bsf: Add back 'k' and 'e' options

broken since af9cac1be1750ecc0e12c6788a3aeed1f1a778be

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/remove_extradata_bsf: Add back 'k' and 'e' options
Michael Niedermayer [Mon, 18 Apr 2016 00:31:55 +0000 (02:31 +0200)]
avcodec/remove_extradata_bsf: Add back 'k' and 'e' options

broken since af9cac1be1750ecc0e12c6788a3aeed1f1a778be

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/bitstream_filter: Fix initializing options from the argument string
Michael Niedermayer [Sun, 17 Apr 2016 22:06:13 +0000 (00:06 +0200)]
avcodec/bitstream_filter: Fix initializing options from the argument string

Fixes ffmpeg ... -vbsf noise=234 ...

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/intrax8: Remove duplicated chunk from ba5bcf96124a4933eef170dfe7955809d8d54a64
Michael Niedermayer [Sun, 17 Apr 2016 22:42:41 +0000 (00:42 +0200)]
avcodec/intrax8: Remove duplicated chunk from ba5bcf96124a4933eef170dfe7955809d8d54a64

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/fic: Cosmetics, fix a typo.
Carl Eugen Hoyos [Sun, 17 Apr 2016 22:18:54 +0000 (00:18 +0200)]
lavc/fic: Cosmetics, fix a typo.

Found by Moritz Barsnick

3 years agolavfi/perspective: Add basic timeline editing.
Thilo Borgmann [Sun, 10 Apr 2016 16:18:17 +0000 (18:18 +0200)]
lavfi/perspective: Add basic timeline editing.

Add number of input and output frames to possible variables.
Add option eval to reevaluate coordinate expressions during
initialization or for every frame.

3 years agoMerge commit 'a84713e70d06238100cb0f867ad6031c272054b0'
Derek Buitenhuis [Sun, 17 Apr 2016 18:46:01 +0000 (19:46 +0100)]
Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'

This commit is a no-op.

* commit 'a84713e70d06238100cb0f867ad6031c272054b0':
  parseutils-test: Move some variable declarations to avoid block braces

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolavc/webp: Print a warning for unsupported chunks.
Carl Eugen Hoyos [Sun, 17 Apr 2016 18:42:10 +0000 (20:42 +0200)]
lavc/webp: Print a warning for unsupported chunks.

3 years agoMerge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'
Derek Buitenhuis [Sun, 17 Apr 2016 18:40:53 +0000 (19:40 +0100)]
Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'

* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7':
  des-test: Move a variable declaration to avoid an ifdef

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'
Derek Buitenhuis [Sun, 17 Apr 2016 18:39:57 +0000 (19:39 +0100)]
Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'

* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
  build: Add component for the SRTP common code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'
Derek Buitenhuis [Sun, 17 Apr 2016 18:37:54 +0000 (19:37 +0100)]
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'

* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4':
  timefilter-test: Only compile timefilter-test if JACK is enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'
Derek Buitenhuis [Sun, 17 Apr 2016 18:36:59 +0000 (19:36 +0100)]
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'

* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7':
  doc: Update paths to match new examples location

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'
Derek Buitenhuis [Sun, 17 Apr 2016 18:35:03 +0000 (19:35 +0100)]
Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'

* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a':
  Move const qualifier before type name

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'
Derek Buitenhuis [Sun, 17 Apr 2016 18:32:26 +0000 (19:32 +0100)]
Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'

* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59':
  vc1dec: wmv2dec: Validate ff_intrax8_common_init return value

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '0372e73f917e72c40b09270f771046fc142be4a7'
Derek Buitenhuis [Sun, 17 Apr 2016 18:31:32 +0000 (19:31 +0100)]
Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'

* commit '0372e73f917e72c40b09270f771046fc142be4a7':
  intrax8: Check and propagate errors from ff_intrax8_common_init

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'
Derek Buitenhuis [Sun, 17 Apr 2016 18:30:01 +0000 (19:30 +0100)]
Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'

* commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345':
  intrax8: Move documentation from implementation to header file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'
Derek Buitenhuis [Sun, 17 Apr 2016 18:21:37 +0000 (19:21 +0100)]
Merge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'

* commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950':
  intrax8: K&R formatting cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'
Derek Buitenhuis [Sun, 17 Apr 2016 18:13:25 +0000 (19:13 +0100)]
Merge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'

* commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13':
  intrax8: Adjust printf conversion specifier for sizeof expression

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '42244ce07a1f4f5108ae86d50fe72db785d483ed'
Derek Buitenhuis [Sun, 17 Apr 2016 18:11:37 +0000 (19:11 +0100)]
Merge commit '42244ce07a1f4f5108ae86d50fe72db785d483ed'

* commit '42244ce07a1f4f5108ae86d50fe72db785d483ed':
  intrax8: Move a comment to the place it corresponds

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '750562549ceef268b29b94f6a887d9cf331a8c78'
Derek Buitenhuis [Sun, 17 Apr 2016 18:11:13 +0000 (19:11 +0100)]
Merge commit '750562549ceef268b29b94f6a887d9cf331a8c78'

* commit '750562549ceef268b29b94f6a887d9cf331a8c78':
  intrax8: Wrap multiline macros in do{}while(0) clauses

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'
Derek Buitenhuis [Sun, 17 Apr 2016 18:09:12 +0000 (19:09 +0100)]
Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'

* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4':
  intrax8: Move error resilience out of intrax8

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'
Derek Buitenhuis [Sun, 17 Apr 2016 18:06:14 +0000 (19:06 +0100)]
Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'

* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc':
  nuv: Use the correct context for av_image_check_size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'
Derek Buitenhuis [Sun, 17 Apr 2016 17:53:05 +0000 (18:53 +0100)]
Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'

* commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a':
  indeo4: Consistently initialize variables

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
Derek Buitenhuis [Sun, 17 Apr 2016 17:51:58 +0000 (18:51 +0100)]
Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'

* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721':
  indeo4: Rework stream analysis report

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'
Derek Buitenhuis [Sun, 17 Apr 2016 17:50:06 +0000 (18:50 +0100)]
Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'

This commit is a no-op. We will do this when we convert ffmpeg.c

* commit '4426540f0c3ee516662f79d0a6ab5b95503b6611':
  avconv: switch to the new BSF API

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'
Derek Buitenhuis [Sun, 17 Apr 2016 17:47:25 +0000 (18:47 +0100)]
Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'

* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
  lavc: add a new bitstream filtering API

Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavfilter/vf_readvitc: Use avpriv_frame_get_metadatap() avoid direct access to AVFrame...
Michael Niedermayer [Sun, 17 Apr 2016 14:49:00 +0000 (16:49 +0200)]
avfilter/vf_readvitc: Use avpriv_frame_get_metadatap() avoid direct access to AVFrame.metadata (to comply to API)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agovp9: ignore frame_context_index field in key-/intraonly-frames.
Ronald S. Bultje [Sun, 17 Apr 2016 13:28:56 +0000 (09:28 -0400)]
vp9: ignore frame_context_index field in key-/intraonly-frames.

Reproduces a bug to remain consistent with libvpx' behaviour.

3 years agovf_scale: support bt2020 in in/out_color_matrix properties.
Ronald S. Bultje [Fri, 15 Apr 2016 18:26:37 +0000 (14:26 -0400)]
vf_scale: support bt2020 in in/out_color_matrix properties.

3 years agoavfilter/colorspacedsp_template: Add argument protecting () to avg()
Michael Niedermayer [Sun, 17 Apr 2016 09:44:47 +0000 (11:44 +0200)]
avfilter/colorspacedsp_template: Add argument protecting () to avg()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/takdec: fix decoding of some sample rates with multichannel coder
Paul B Mahol [Sat, 16 Apr 2016 22:13:55 +0000 (00:13 +0200)]
avcodec/takdec: fix decoding of some sample rates with multichannel coder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/h264: Fix for H.264 configuration parsing
Ivan [Tue, 12 Apr 2016 20:32:04 +0000 (16:32 -0400)]
avcodec/h264: Fix for H.264 configuration parsing

Sometimes video fails to decode if H.264 configuration changes mid stream.
The reason is that configuration parser assumes that nal_ref_idc is equal to 11b
while actually some codecs but 01b there. The H.264 spec is somewhat
vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/hashenc: add missing avio_flush to hash_write_trailer
James Almer [Sun, 17 Apr 2016 00:31:58 +0000 (21:31 -0300)]
avformat/hashenc: add missing avio_flush to hash_write_trailer

It was accidentally deleted in the previous hashenc commit

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declaratio...
Michael Niedermayer [Sat, 16 Apr 2016 23:37:27 +0000 (01:37 +0200)]
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agofate: add test for Ticket4816 (PNG decoding with alpha)
Michael Niedermayer [Wed, 13 Apr 2016 16:38:21 +0000 (18:38 +0200)]
fate: add test for Ticket4816 (PNG decoding with alpha)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agovc2enc: use 32x16 slices by default
Rostislav Pehlivanov [Sat, 16 Apr 2016 22:57:46 +0000 (23:57 +0100)]
vc2enc: use 32x16 slices by default

Approximately 1.25 times faster than 64x32, visually and
statistically improves quality.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agovc2enc: don't require interlacing for 1080p50/60 base video formats
Rostislav Pehlivanov [Sat, 16 Apr 2016 22:56:14 +0000 (23:56 +0100)]
vc2enc: don't require interlacing for 1080p50/60 base video formats

Typo

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoavfilter: add readvitc filter
Tobias Rapp [Wed, 6 Apr 2016 14:25:53 +0000 (16:25 +0200)]
avfilter: add readvitc filter

Add a filter to scan the top lines of video frames for vertical interval
timecode (VITC) information and attach it as metadata keys.

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
3 years agoavfilter/af_hdcd: Fix informations typo
Michael Niedermayer [Fri, 15 Apr 2016 22:45:11 +0000 (00:45 +0200)]
avfilter/af_hdcd: Fix informations typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is...
Michael Niedermayer [Fri, 15 Apr 2016 17:49:27 +0000 (19:49 +0200)]
avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again

Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf/bink: Cosmetics: Reindent after last commit.
Carl Eugen Hoyos [Fri, 15 Apr 2016 19:26:04 +0000 (21:26 +0200)]
lavf/bink: Cosmetics: Reindent after last commit.

3 years agolavf/bink: Support Monkey Island 4 (SMUSH) files.
Carl Eugen Hoyos [Fri, 15 Apr 2016 19:22:10 +0000 (21:22 +0200)]
lavf/bink: Support Monkey Island 4 (SMUSH) files.

Fixes ticket #5410.

3 years agolavc/dds: Fix GRAY8A decoding.
Carl Eugen Hoyos [Fri, 15 Apr 2016 19:06:34 +0000 (21:06 +0200)]
lavc/dds: Fix GRAY8A decoding.

Fixes ticket #4667.

3 years agoavcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_p...
Michael Niedermayer [Thu, 14 Apr 2016 22:42:22 +0000 (00:42 +0200)]
avcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_per_raw_sample

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/utils: Add braces to framecount computation
Michael Niedermayer [Fri, 15 Apr 2016 13:22:40 +0000 (15:22 +0200)]
avcodec/utils: Add braces to framecount computation

Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/utils: Fix duration of ATRAC3 packets
Michael Niedermayer [Fri, 15 Apr 2016 12:50:11 +0000 (14:50 +0200)]
avcodec/utils: Fix duration of ATRAC3 packets

Fixes ticket1680

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavfi/af_hdcd: Implement high definition audio cd filtering.
Benjamin Steffes [Fri, 15 Apr 2016 10:14:55 +0000 (12:14 +0200)]
lavfi/af_hdcd: Implement high definition audio cd filtering.

Fixes ticket #4441.

3 years agoavformat/hashenc: simplify hash_write_trailer
James Almer [Thu, 14 Apr 2016 23:49:35 +0000 (20:49 -0300)]
avformat/hashenc: simplify hash_write_trailer

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec: Add bits_per_raw_sample to AVCodecParameters
Michael Niedermayer [Tue, 12 Apr 2016 11:10:09 +0000 (13:10 +0200)]
avcodec: Add bits_per_raw_sample to AVCodecParameters

The bits_per_raw_sample represents the number of bits of precision per sample.

The field is added at the logical place, not at the end as the code was just
recently added

This fixes the regression about losing the audio sample precision information

The change in the fate test checksum un-does the change from the merge

Previous version reviewed by: wm4 <nfxjfg@googlemail.com>
Previous version reviewed by: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/yop: alloc codecpar extradata only once
James Almer [Thu, 14 Apr 2016 18:55:10 +0000 (15:55 -0300)]
avformat/yop: alloc codecpar extradata only once

Fixes memleak

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/ralf: add support for mono
Paul B Mahol [Thu, 14 Apr 2016 20:31:57 +0000 (22:31 +0200)]
avcodec/ralf: add support for mono

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/atrac3: pass AVCodecContext to av_log if available
Paul B Mahol [Thu, 14 Apr 2016 16:47:57 +0000 (18:47 +0200)]
avcodec/atrac3: pass AVCodecContext to av_log if available

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavformat: add AVFormatContext to ff_get_extradata()
Paul B Mahol [Thu, 14 Apr 2016 16:21:08 +0000 (18:21 +0200)]
avformat: add AVFormatContext to ff_get_extradata()

Needed for av_log() inside that function.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossi...
Michael Niedermayer [Thu, 14 Apr 2016 13:10:31 +0000 (15:10 +0200)]
avcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossing corner case

Fixes Ticket 5438

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b'
Derek Buitenhuis [Thu, 14 Apr 2016 13:02:16 +0000 (14:02 +0100)]
Merge commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b'

This commit is a no-op.

* commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b':
  takdec: ensure chan2 is a valid channel index

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'
Derek Buitenhuis [Thu, 14 Apr 2016 13:01:31 +0000 (14:01 +0100)]
Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'

* commit '9765549f551ff40869aee1a6492b6a976c86cfe9':
  mpegts: Forward the errors on mpeg4 objects parsing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'
Derek Buitenhuis [Thu, 14 Apr 2016 12:59:45 +0000 (13:59 +0100)]
Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'

* commit '07a844f32ebb78503981df017fa3ebfedb75fe1c':
  lavfi: generic hardware surface upload and download filters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
Derek Buitenhuis [Thu, 14 Apr 2016 12:49:55 +0000 (13:49 +0100)]
Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'

* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
  lavu: VAAPI hwcontext implementation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd264c720f7b74286840719e506daba39f83b438b'
Derek Buitenhuis [Thu, 14 Apr 2016 12:44:19 +0000 (13:44 +0100)]
Merge commit 'd264c720f7b74286840719e506daba39f83b438b'

* commit 'd264c720f7b74286840719e506daba39f83b438b':
  lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'
Derek Buitenhuis [Thu, 14 Apr 2016 12:33:37 +0000 (13:33 +0100)]
Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'

* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
  lavu: add a way to query hwcontext frame constraints

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5'
Derek Buitenhuis [Thu, 14 Apr 2016 12:25:17 +0000 (13:25 +0100)]
Merge commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5'

* commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5':
  svq3: Use a separate buffer for decoding the slices

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavformat/framehash: enable new output
James Almer [Thu, 14 Apr 2016 00:13:21 +0000 (21:13 -0300)]
avformat/framehash: enable new output

Also, make every addition except for sidedata part of version 1 instead of the
new version 2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/framehash: add sidedata checksum
James Almer [Wed, 13 Apr 2016 20:58:40 +0000 (17:58 -0300)]
avformat/framehash: add sidedata checksum

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/tee: Refactor close_slaves function in tee muxer
Jan Sebechlebsky [Tue, 12 Apr 2016 17:46:27 +0000 (20:46 +0300)]
avformat/tee: Refactor close_slaves function in tee muxer

Closing single slave operation is pulled out into separate
function close_slave(TeeSlave*).
Both close_slave and close_slaves function are moved before
open_slave function.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
3 years agoavformat/dump: Fix sign bug in reported "start" time
Bryan Huh [Wed, 13 Apr 2016 04:49:27 +0000 (21:49 -0700)]
avformat/dump: Fix sign bug in reported "start" time

Previously, the bug was that if -1 < start_time < 0, the reported
"start" time would lose the negative-sign.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/wmalosslessdec: improve 24bit support
Paul B Mahol [Wed, 13 Apr 2016 18:36:26 +0000 (20:36 +0200)]
avcodec/wmalosslessdec: improve 24bit support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/wmalosslessdec: improve >2 channel support
Paul B Mahol [Wed, 13 Apr 2016 18:21:07 +0000 (20:21 +0200)]
avcodec/wmalosslessdec: improve >2 channel support

Before it worked for stereo files only.

Signed-off-by: Paul B Mahol <onemda@gmail.com>