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

4 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

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

4 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

4 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>
4 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>
4 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>
4 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>
4 years agolibavfilter/vf_owdenoise.c: skip processing when strength is 0
Yuuki Galaxy [Tue, 12 Apr 2016 14:53:58 +0000 (22:53 +0800)]
libavfilter/vf_owdenoise.c: skip processing when strength is 0

It is practical to de-noise only on luma while keeping chroma unchanged.

However, libavfilter/vf_owdenoise.c always do the Wavelet transform/retransform on all 3 channels without check whether chroma_strength is 0.

Thus I make this patch. De-noise on Y only for yuv420 is now 1.5 times faster.

Signed-off-by: Yuuki Galaxy <galaxy001@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/exr: fix huf_decode
Martin Vignali [Tue, 12 Apr 2016 18:01:08 +0000 (20:01 +0200)]
avcodec/exr: fix huf_decode

4 years agoavcodec/exr: fix clearing end of bitmap
Paul B Mahol [Tue, 12 Apr 2016 19:39:32 +0000 (21:39 +0200)]
avcodec/exr: fix clearing end of bitmap

Inspired by patch from Martin Vignali.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agovf_colorspace: x86-64 SIMD (SSE2) optimizations.
Ronald S. Bultje [Wed, 6 Apr 2016 18:09:08 +0000 (14:09 -0400)]
vf_colorspace: x86-64 SIMD (SSE2) optimizations.

4 years agolavfi: new colorspace conversion filter.
Ronald S. Bultje [Wed, 6 Apr 2016 18:08:21 +0000 (14:08 -0400)]
lavfi: new colorspace conversion filter.

The intent here is similar to colormatrix, but it's LGPLv2.1-or-later
(instead of GPLv2.0) and supports gamma/chromaticity correction.

4 years agoarm/rdft_init: fix license header
James Almer [Tue, 12 Apr 2016 18:01:19 +0000 (15:01 -0300)]
arm/rdft_init: fix license header

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/framehash: Add more information to the output
Michael Niedermayer [Tue, 12 Apr 2016 14:17:47 +0000 (11:17 -0300)]
avformat/framehash: Add more information to the output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat: add hash and framehash muxers
Moritz Barsnick [Tue, 12 Apr 2016 14:16:18 +0000 (11:16 -0300)]
avformat: add hash and framehash muxers

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoffprobe: Don't try and decode things that have no dec_ctx
Derek Buitenhuis [Tue, 12 Apr 2016 16:23:38 +0000 (17:23 +0100)]
ffprobe: Don't try and decode things that have no dec_ctx

The last instance of a missing dec_ctx check from the merge.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoffprobe: Fix missing dec_ctx check
Derek Buitenhuis [Tue, 12 Apr 2016 15:50:01 +0000 (16:50 +0100)]
ffprobe: Fix missing dec_ctx check

Missed it during the merge of ffprobe codecpar conversion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716'
Derek Buitenhuis [Tue, 12 Apr 2016 14:59:29 +0000 (15:59 +0100)]
Merge commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716'

This commit is a no-op.

* commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716':
  sdp: fix opus sprop-stereo fmtp syntax

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83'
Derek Buitenhuis [Tue, 12 Apr 2016 14:58:15 +0000 (15:58 +0100)]
Merge commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83'

* commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83':
  fate: fft: Split DCT/FFT/MDCT/RDFT tests into separate targets

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '4c297249ac0f513a610a62691ce96d6b62f65b94'
Derek Buitenhuis [Tue, 12 Apr 2016 14:43:31 +0000 (15:43 +0100)]
Merge commit '4c297249ac0f513a610a62691ce96d6b62f65b94'

* commit '4c297249ac0f513a610a62691ce96d6b62f65b94':
  rdft: arm: Split RDFT initialization into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'
Derek Buitenhuis [Tue, 12 Apr 2016 14:43:01 +0000 (15:43 +0100)]
Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'

* commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555':
  fft: arm: Drop unnecessary #include, add missing ones

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622'
Derek Buitenhuis [Tue, 12 Apr 2016 14:42:14 +0000 (15:42 +0100)]
Merge commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622'

* commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622':
  fft: x86: cosmetics: Drop silly comments, add comment, whitespace

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'
Derek Buitenhuis [Tue, 12 Apr 2016 14:41:46 +0000 (15:41 +0100)]
Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'

* commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd':
  qsv: Move down the implementation query

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'dbb43b8b83b097585ec255ec638b61e359ebea77'
Derek Buitenhuis [Tue, 12 Apr 2016 14:39:01 +0000 (15:39 +0100)]
Merge commit 'dbb43b8b83b097585ec255ec638b61e359ebea77'

* commit 'dbb43b8b83b097585ec255ec638b61e359ebea77':
  avpacket: properly reset data/size in av_packet_move_ref()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'ba357e98691ee4fe1a503b8830c0050be4127475'
Derek Buitenhuis [Tue, 12 Apr 2016 14:37:48 +0000 (15:37 +0100)]
Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475'

* commit 'ba357e98691ee4fe1a503b8830c0050be4127475':
  avprobe: switch to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec/apedec: fix decoding of stereo files with one channel full of silence
Paul B Mahol [Tue, 12 Apr 2016 08:51:30 +0000 (10:51 +0200)]
avcodec/apedec: fix decoding of stereo files with one channel full of silence

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/utils: use av_codec_g/set_lowres()
Michael Niedermayer [Tue, 12 Apr 2016 01:55:19 +0000 (03:55 +0200)]
avformat/utils: use av_codec_g/set_lowres()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/concatdec: Use correct stream count on close
Timo Rothenpieler [Mon, 11 Apr 2016 17:27:18 +0000 (19:27 +0200)]
avformat/concatdec: Use correct stream count on close

4 years agodoc/filters: document testsrc2 source filter
Lou Logan [Sat, 9 Apr 2016 01:07:10 +0000 (17:07 -0800)]
doc/filters: document testsrc2 source filter

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agoswscale/arm: add yuv2planeX_8_neon
Matthieu Bouron [Fri, 8 Apr 2016 15:32:24 +0000 (15:32 +0000)]
swscale/arm: add yuv2planeX_8_neon

4 years agodoc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec...
Michael Niedermayer [Mon, 11 Apr 2016 15:39:14 +0000 (17:39 +0200)]
doc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec flags are not available to the muxer anymore

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '567d6d5f9d1400f00445183b3477391f58979aa3'
Derek Buitenhuis [Mon, 11 Apr 2016 15:46:22 +0000 (16:46 +0100)]
Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'

* commit '567d6d5f9d1400f00445183b3477391f58979aa3':
  avprobe: add local per-stream state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'
Derek Buitenhuis [Mon, 11 Apr 2016 15:33:04 +0000 (16:33 +0100)]
Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'

* commit 'c9478410c68c04261f9cfcd80474607e50bd1852':
  avprobe: add local per-file state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'
Derek Buitenhuis [Mon, 11 Apr 2016 15:02:08 +0000 (16:02 +0100)]
Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'

* commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b':
  mpegvideo_enc: use avcodec_free_context() instead of av_free()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'
Derek Buitenhuis [Mon, 11 Apr 2016 15:01:10 +0000 (16:01 +0100)]
Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'

* commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7':
  avprobe: print information from the codec descriptor

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'
Derek Buitenhuis [Mon, 11 Apr 2016 14:30:47 +0000 (15:30 +0100)]
Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'

* commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd':
  avprobe: remove a pointless condition and a dead branch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agosws/aarch64: add ff_yuv2planeX_8_neon
Clément Bœsch [Fri, 1 Apr 2016 15:27:29 +0000 (17:27 +0200)]
sws/aarch64: add ff_yuv2planeX_8_neon

4 years agoMerge commit 'dc4983d78af2a666461654067d2e5d45b835358a'
Derek Buitenhuis [Mon, 11 Apr 2016 14:09:54 +0000 (15:09 +0100)]
Merge commit 'dc4983d78af2a666461654067d2e5d45b835358a'

This commit is a no-op.

* commit 'dc4983d78af2a666461654067d2e5d45b835358a':
  APIchanges: add missing hashes and dates

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

* commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc':
  lavf: add a missing bump and APIchanges for the codecpar switch

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

* commit 'e66fa35392cd45d0a80774cd057fb765d60def43':
  vc1dec: Check group allocations separatedly

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596'
Derek Buitenhuis [Mon, 11 Apr 2016 14:03:14 +0000 (15:03 +0100)]
Merge commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596'

This commit is a no-op. We already did this.

* commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596':
  vc1dec: Fix leak on error for array allocations

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f'
Derek Buitenhuis [Mon, 11 Apr 2016 14:01:33 +0000 (15:01 +0100)]
Merge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f'

* commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f':
  vc1dec: Properly call deinit function on error

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '35b1cd343cd703c1b0fc926dc43a92141a357380'
Derek Buitenhuis [Mon, 11 Apr 2016 14:00:46 +0000 (15:00 +0100)]
Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380'

* commit '35b1cd343cd703c1b0fc926dc43a92141a357380':
  vc1dec: Drop commented out cruft

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'fa55addd23c2f168163175aee17adb125c2c0710'
Derek Buitenhuis [Mon, 11 Apr 2016 13:59:58 +0000 (14:59 +0100)]
Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'

* commit 'fa55addd23c2f168163175aee17adb125c2c0710':
  img2: Drop av_ prefix for a static function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6'
Derek Buitenhuis [Mon, 11 Apr 2016 13:58:33 +0000 (14:58 +0100)]
Merge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6'

This commit is a no-op.

* commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6':
  idct: Only build prores IDCT if ProRes decoder is enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'
Derek Buitenhuis [Mon, 11 Apr 2016 13:56:27 +0000 (14:56 +0100)]
Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'

* commit '3c53627ac17fc6bdea5029be57da1e03b32d265d':
  qsvdec: store the sync point in heap memory

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'a1335149fd610b16459d9281b611282cac51c950'
Derek Buitenhuis [Mon, 11 Apr 2016 13:45:57 +0000 (14:45 +0100)]
Merge commit 'a1335149fd610b16459d9281b611282cac51c950'

* commit 'a1335149fd610b16459d9281b611282cac51c950':
  qsvenc: store the sync point in heap memory

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9'
Derek Buitenhuis [Mon, 11 Apr 2016 13:42:30 +0000 (14:42 +0100)]
Merge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9'

* commit '1138eb5509d3db7f6d565cb45f137a786d22beb9':
  vsrc_movie: convert to codecpar

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

* commit 'ac6d53589f3631ae08467c784fb371a15c957f01':
  examples/transcode_aac: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'
Derek Buitenhuis [Mon, 11 Apr 2016 13:07:34 +0000 (14:07 +0100)]
Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'

* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
  examples/qsvdec: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7'
Derek Buitenhuis [Mon, 11 Apr 2016 13:06:43 +0000 (14:06 +0100)]
Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7'

* commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7':
  examples/output: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec/shorten: properly handle bitshift > 31
Paul B Mahol [Mon, 11 Apr 2016 11:06:10 +0000 (13:06 +0200)]
avcodec/shorten: properly handle bitshift > 31

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/hdsenc: Pass flags to child context
Michael Niedermayer [Mon, 11 Apr 2016 01:59:12 +0000 (03:59 +0200)]
avformat/hdsenc: Pass flags to child context

This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/dashenc: Pass flags to child context
Michael Niedermayer [Mon, 11 Apr 2016 01:59:12 +0000 (03:59 +0200)]
avformat/dashenc: Pass flags to child context

This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/segment: Pass flags to child context
Michael Niedermayer [Mon, 11 Apr 2016 01:59:12 +0000 (03:59 +0200)]
avformat/segment: Pass flags to child context

This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavdevice/caca: switch to codecpar
Michael Niedermayer [Sun, 10 Apr 2016 21:59:12 +0000 (23:59 +0200)]
avdevice/caca: switch to codecpar

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agofate: fix sample dependencies for fate-{a,v}filter tests
James Almer [Sun, 10 Apr 2016 21:31:05 +0000 (18:31 -0300)]
fate: fix sample dependencies for fate-{a,v}filter tests

4 years agoMerge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'
Derek Buitenhuis [Sun, 10 Apr 2016 20:49:15 +0000 (21:49 +0100)]
Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'

This commit is a no-op. We want to do this ourselves since avplay and
ffplay differ quite a bit.

* commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70':
  avplay: convert do codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '0705f5960c9d272cef1309c090000865b991c9c7'
Derek Buitenhuis [Sun, 10 Apr 2016 20:48:24 +0000 (21:48 +0100)]
Merge commit '0705f5960c9d272cef1309c090000865b991c9c7'

This commit is a no-op. We did this already in 9e0d1c00b5832e80dc11368e3d39f9e2ec9346f1.

* commit '0705f5960c9d272cef1309c090000865b991c9c7':
  avplay: do not use AVStream.codec for decoding

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
4 years agoMerge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'
Derek Buitenhuis [Sun, 10 Apr 2016 20:47:26 +0000 (21:47 +0100)]
Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'

This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.

* commit '15e84ed3f141c586e8cb78ed58365cf5a511108a':
  avconv: convert to codecpar

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
4 years agoMerge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d'
Derek Buitenhuis [Sun, 10 Apr 2016 20:29:30 +0000 (21:29 +0100)]
Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d'

This commit is a no-op. We already moved it here.

* commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d':
  avconv: switch opening decoders and encoders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9200514ad8717c63f82101dc394f4378854325bf'
Derek Buitenhuis [Sun, 10 Apr 2016 19:58:15 +0000 (20:58 +0100)]
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavcodec/wmalosslessdec: do not discard last frame
Jakub Stachowski [Sun, 10 Apr 2016 19:33:56 +0000 (21:33 +0200)]
avcodec/wmalosslessdec: do not discard last frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/shorten: mark as AV_CODEC_CAP_SUBFRAMES
Paul B Mahol [Sun, 10 Apr 2016 13:30:03 +0000 (15:30 +0200)]
avcodec/shorten: mark as AV_CODEC_CAP_SUBFRAMES

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agofate/exr : add test for PXR24 Float and tile uncompress
Martin Vignali [Mon, 4 Apr 2016 14:42:00 +0000 (16:42 +0200)]
fate/exr : add test for PXR24 Float and tile uncompress

4 years agoavcodec/exr: fix channel detection
Martin Vignali [Thu, 7 Apr 2016 09:17:18 +0000 (11:17 +0200)]
avcodec/exr: fix channel detection

4 years agolavf/avio: Remove linebreak from https warning.
Carl Eugen Hoyos [Sun, 10 Apr 2016 13:39:13 +0000 (15:39 +0200)]
lavf/avio: Remove linebreak from https warning.

4 years agoavformat/mpegts: Remove unused argument from analyze()
Michael Niedermayer [Sun, 10 Apr 2016 11:18:17 +0000 (13:18 +0200)]
avformat/mpegts: Remove unused argument from analyze()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mpegts: Check adaption field control in analyze() more instead of transport_...
Michael Niedermayer [Sun, 10 Apr 2016 11:08:00 +0000 (13:08 +0200)]
avformat/mpegts: Check adaption field control in analyze() more instead of transport_error_indicator

transport_error_indicator is not required to be 0

Fixes probing
Fixes Ticket 4862

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/shorten: add support for AIFF packing, not bitexact
Paul B Mahol [Sat, 9 Apr 2016 19:07:10 +0000 (21:07 +0200)]
avcodec/shorten: add support for AIFF packing, not bitexact

Also report unsupported packing.

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