avfilter/af_hdcd: Fix informations typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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>

lavf/bink: Cosmetics: Reindent after last commit.

lavf/bink: Support Monkey Island 4 (SMUSH) files.

Fixes ticket #5410.

lavc/dds: Fix GRAY8A decoding.

Fixes ticket #4667.

avcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_per_raw_sample

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Add braces to framecount computation

Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Fix duration of ATRAC3 packets

Fixes ticket1680

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavfi/af_hdcd: Implement high definition audio cd filtering.

Fixes ticket #4441.

avformat/hashenc: simplify hash_write_trailer

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

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>

avformat/yop: alloc codecpar extradata only once

Fixes memleak

Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/ralf: add support for mono

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

avcodec/atrac3: pass AVCodecContext to av_log if available

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

avformat: add AVFormatContext to ff_get_extradata()

Needed for av_log() inside that function.

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

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>

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>

Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

avformat/framehash: add sidedata checksum

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

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>

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>

avcodec/wmalosslessdec: improve 24bit support

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

avcodec/wmalosslessdec: improve >2 channel support

Before it worked for stereo files only.

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

tests/checkasm/vf_colorspace: Make bpp_mask const

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

doc/demuxers: fix "Quicktme" typo

Signed-off-by: Lou Logan <lou@lrcd.com>
Found-by: furq

avformat/framehash: add extradata checksum

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

avformat/framecrc: enable new output

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

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>

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>

Merge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

Merge commit '7480d001312d9ba706333ec970264ed9df3f82cb'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

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>

Merge commit '0242351390643d176b10600c2eb854414f9559e6'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

Merge commit '1389b4c18d1042c196603ba66c25113bcee1738b'

This commit is a no-op.

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'd40cb726d271b0284642a1ba159eb26a5c579f77'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

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>

Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '84b5dcf27589b32713a4ba0723a129156b4d2408'

This commit is a no-op.

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '11843ededacd0157aea642771837557549b5b417'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

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>

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>

lavf/audiotoolboxdec: only provide block alignment for ILBC

Fixes decode errors for some AVI files

lavf/audiotoolboxdec: only send extradata for formats that use it

Fixes initialization errors for some AVI files

lavc/audiotoolboxdec: reindent

lavc/audiotoolboxdec: avoid relying on consumer-provided params when possible

avfilter/vf_drawtext: add optional default value to metadata function

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

avformat/uncodedframecrc: fix incompatible pointer type warning

Signed-off-by: James Almer <jamrial@gmail.com>

tests/checkasm/vf_colorspace: Fix dst array sizes

Suggested & Approved by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffplay: convert to codecpar

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

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>

avcodec/exr: fix huf_decode

avcodec/exr: fix clearing end of bitmap

Inspired by patch from Martin Vignali.

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

vf_colorspace: x86-64 SIMD (SSE2) optimizations.

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.

arm/rdft_init: fix license header

Signed-off-by: James Almer <jamrial@gmail.com>

avformat/framehash: Add more information to the output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

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>

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>

ffprobe: Fix missing dec_ctx check

Missed it during the merge of ffprobe codecpar conversion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

Merge commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '4c297249ac0f513a610a62691ce96d6b62f65b94'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'dbb43b8b83b097585ec255ec638b61e359ebea77'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475'

* commit 'ba357e98691ee4fe1a503b8830c0050be4127475':
  avprobe: switch to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/apedec: fix decoding of stereo files with one channel full of silence

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

avformat/utils: use av_codec_g/set_lowres()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/concatdec: Use correct stream count on close

doc/filters: document testsrc2 source filter

Signed-off-by: Lou Logan <lou@lrcd.com>

swscale/arm: add yuv2planeX_8_neon

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>

Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

sws/aarch64: add ff_yuv2planeX_8_neon

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>

Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'e66fa35392cd45d0a80774cd057fb765d60def43'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>