ffmpeg.git
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>
3 years agotests/checkasm/vf_colorspace: Make bpp_mask const
Michael Niedermayer [Wed, 13 Apr 2016 16:54:17 +0000 (18:54 +0200)]
tests/checkasm/vf_colorspace: Make bpp_mask const

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/demuxers: fix "Quicktme" typo
Lou Logan [Wed, 13 Apr 2016 18:40:24 +0000 (10:40 -0800)]
doc/demuxers: fix "Quicktme" typo

Signed-off-by: Lou Logan <lou@lrcd.com>
Found-by: furq
3 years agoavformat/framehash: add extradata checksum
James Almer [Wed, 13 Apr 2016 13:49:16 +0000 (10:49 -0300)]
avformat/framehash: add extradata checksum

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/framecrc: enable new output
James Almer [Wed, 13 Apr 2016 14:18:59 +0000 (11:18 -0300)]
avformat/framecrc: enable new output

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361'
Derek Buitenhuis [Wed, 13 Apr 2016 16:35:30 +0000 (17:35 +0100)]
Merge commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361'

This commit is a no-op.

* commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361':
  cmdutils: update copyright year to 2016

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d'
Derek Buitenhuis [Wed, 13 Apr 2016 16:34:12 +0000 (17:34 +0100)]
Merge commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d'

This commit is a no-op.

* commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d':
  matroska: Support V_QUICKTIME as written in the specification

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'
Derek Buitenhuis [Wed, 13 Apr 2016 16:31:25 +0000 (17:31 +0100)]
Merge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'

* commit '92c1a83ee9394b39d68f6affd9104752a03714f8':
  qsv: Fix loading multiple plugins

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328'
Derek Buitenhuis [Wed, 13 Apr 2016 16:30:42 +0000 (17:30 +0100)]
Merge commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328'

* commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328':
  mov: Check the entries value when parsing dref boxes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0'
Derek Buitenhuis [Wed, 13 Apr 2016 16:29:03 +0000 (17:29 +0100)]
Merge commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0'

* commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0':
  configure: Add support for clang llvm-cov

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2'
Derek Buitenhuis [Wed, 13 Apr 2016 16:28:38 +0000 (17:28 +0100)]
Merge commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2'

* commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2':
  configure: Support msan as toolchain

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '328e9a15c568843580ff3ff490748d545f16def8'
Derek Buitenhuis [Wed, 13 Apr 2016 16:26:56 +0000 (17:26 +0100)]
Merge commit '328e9a15c568843580ff3ff490748d545f16def8'

* commit '328e9a15c568843580ff3ff490748d545f16def8':
  buffer: drop a reference to a non-existing function from the docs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '7480d001312d9ba706333ec970264ed9df3f82cb'
Derek Buitenhuis [Wed, 13 Apr 2016 16:26:08 +0000 (17:26 +0100)]
Merge commit '7480d001312d9ba706333ec970264ed9df3f82cb'

* commit '7480d001312d9ba706333ec970264ed9df3f82cb':
  pixfmt: fix the AV_PIX_FMT_VAAPI_VLD doxy

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoRevert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"
Derek Buitenhuis [Wed, 13 Apr 2016 16:10:44 +0000 (17:10 +0100)]
Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"

Broke a lot of stuff and didn't fix anything.

This reverts commit 3c461eecd48ba2cf7616d98e6f99954de3ad4b06, reversing
changes made to 884dd175f061c03d7ba4896685e81bf8adc3ea94.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'
Derek Buitenhuis [Wed, 13 Apr 2016 15:31:16 +0000 (16:31 +0100)]
Merge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'

This commit is a no-op. Ours are not identical / refactorable.

* commit '39a2d3288e82e4e576c03efb32179ef5a19fff50':
  mpegvideo: Refactor emulated_edge_mc calls

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '0242351390643d176b10600c2eb854414f9559e6'
Derek Buitenhuis [Wed, 13 Apr 2016 15:28:41 +0000 (16:28 +0100)]
Merge commit '0242351390643d176b10600c2eb854414f9559e6'

* commit '0242351390643d176b10600c2eb854414f9559e6':
  mpegvideo: Fix undefined negative shifts in mpeg_motion_internal

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '7d4a1ff344cbf969ac648642a0fd8484fd5b8637'
Derek Buitenhuis [Wed, 13 Apr 2016 15:27:32 +0000 (16:27 +0100)]
Merge commit '7d4a1ff344cbf969ac648642a0fd8484fd5b8637'

This commit is a no-op. We solved it already.

* commit '7d4a1ff344cbf969ac648642a0fd8484fd5b8637':
  mpegvideo: Fix undefined negative shifts in ff_init_block_index

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '1389b4c18d1042c196603ba66c25113bcee1738b'
Derek Buitenhuis [Wed, 13 Apr 2016 15:24:42 +0000 (16:24 +0100)]
Merge commit '1389b4c18d1042c196603ba66c25113bcee1738b'

This commit is a no-op.

* commit '1389b4c18d1042c196603ba66c25113bcee1738b':
  idct8x8: Fix undefined negative shifts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'
Derek Buitenhuis [Wed, 13 Apr 2016 15:22:14 +0000 (16:22 +0100)]
Merge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'

* commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0':
  vdpau: Add missing deprecation guards

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

* commit 'd40cb726d271b0284642a1ba159eb26a5c579f77':
  mov: Trim dref absolute path

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

This commit is a no-op.

[16:15] <@Daemon404> wm4, ping
[16:15] <@Daemon404> whats up with "avconv: remove sub-frame warning"
[16:15] <@Daemon404> it's in libav but not ours?
[16:15] <@Daemon404> mailing list bikeshedding?
[16:15] <@wm4> it's in ffmpeg.c too
[16:16] <@wm4> you can probably skip it for now
[16:16] <@wm4> michaelni was against removing it this way
[16:17] <@Daemon404> ok

* commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838':
  avconv: remove sub-frame warning

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874'
Derek Buitenhuis [Wed, 13 Apr 2016 15:14:11 +0000 (16:14 +0100)]
Merge commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874'

This commit is a no-op.

* commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874':
  lavc: factor apply_param_change() AV_EF_EXPLODE handling

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'
Derek Buitenhuis [Wed, 13 Apr 2016 15:11:39 +0000 (16:11 +0100)]
Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'

* commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71':
  lavu: improve documentation of some AVFrame functions

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '84b5dcf27589b32713a4ba0723a129156b4d2408'
Derek Buitenhuis [Wed, 13 Apr 2016 15:10:10 +0000 (16:10 +0100)]
Merge commit '84b5dcf27589b32713a4ba0723a129156b4d2408'

This commit is a no-op.

* commit '84b5dcf27589b32713a4ba0723a129156b4d2408':
  asfenc: remove an unused variable

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

This commit is a no-op. As far as I can tell, we already added
checks, to address this CVE in 7c0b84d89911b2035161f5ef51aafbfcc84aa9e2,
which is also reflected in the CVE database:

    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2326

* commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90':
  asfenc: fix some possible integer overflows

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'
Derek Buitenhuis [Wed, 13 Apr 2016 14:36:55 +0000 (15:36 +0100)]
Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'

* commit '1ceb07eb313c2d51383408025e57a2fe50ccd164':
  avformat_find_stream_info: move duration guessing after updating codec parameters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit '11843ededacd0157aea642771837557549b5b417'
Derek Buitenhuis [Wed, 13 Apr 2016 14:20:48 +0000 (15:20 +0100)]
Merge commit '11843ededacd0157aea642771837557549b5b417'

* commit '11843ededacd0157aea642771837557549b5b417':
  fate: Add separate target for all indeo3 tests

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

* commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d':
  fate: Add test for indeo2 with delta frames

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

This commit is a no-op. They rewrote fixes we already did,
to the character.

* commit 'f8c34f4b8d62afad3f63cf3d9617d73735bef8c1':
  indeo2: Fix banding artefacts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoMerge commit 'd4066a702407352a0648af882c34ea81a404fa2b'
Derek Buitenhuis [Wed, 13 Apr 2016 13:36:16 +0000 (14:36 +0100)]
Merge commit 'd4066a702407352a0648af882c34ea81a404fa2b'

This commit is a no-op. Ours is already formatted the same.

* commit 'd4066a702407352a0648af882c34ea81a404fa2b':
  indeo2data: K&R formatting cosmetics

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

This commit is a no-op. The value of the refactoring is dubious and
merging it is error prone. If someone feels strongly about merging it,
let me know, and I will.

* commit '1a094af638281295bf087945923d258b5acd1ab1':
  fft: Split MDCT bits off from FFT

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agolavf/audiotoolboxdec: only provide block alignment for ILBC
Rodger Combs [Fri, 8 Apr 2016 01:28:32 +0000 (20:28 -0500)]
lavf/audiotoolboxdec: only provide block alignment for ILBC

Fixes decode errors for some AVI files

3 years agolavf/audiotoolboxdec: only send extradata for formats that use it
Rodger Combs [Fri, 8 Apr 2016 01:27:03 +0000 (20:27 -0500)]
lavf/audiotoolboxdec: only send extradata for formats that use it

Fixes initialization errors for some AVI files

3 years agolavc/audiotoolboxdec: reindent
Rodger Combs [Fri, 8 Apr 2016 01:44:47 +0000 (20:44 -0500)]
lavc/audiotoolboxdec: reindent

3 years agolavc/audiotoolboxdec: avoid relying on consumer-provided params when possible
Rodger Combs [Fri, 8 Apr 2016 01:43:37 +0000 (20:43 -0500)]
lavc/audiotoolboxdec: avoid relying on consumer-provided params when possible

3 years agoavfilter/vf_drawtext: add optional default value to metadata function
Tobias Rapp [Thu, 7 Apr 2016 08:20:53 +0000 (10:20 +0200)]
avfilter/vf_drawtext: add optional default value to metadata function

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
3 years agoavformat/uncodedframecrc: fix incompatible pointer type warning
James Almer [Wed, 13 Apr 2016 04:05:02 +0000 (01:05 -0300)]
avformat/uncodedframecrc: fix incompatible pointer type warning

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agotests/checkasm/vf_colorspace: Fix dst array sizes
Michael Niedermayer [Tue, 12 Apr 2016 21:40:07 +0000 (23:40 +0200)]
tests/checkasm/vf_colorspace: Fix dst array sizes

Suggested & Approved by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffplay: convert to codecpar
Marton Balint [Mon, 11 Apr 2016 00:25:38 +0000 (02:25 +0200)]
ffplay: convert to codecpar

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>