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>

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>

Merge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f'

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

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

Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380'

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

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

Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'

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

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

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>

Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'

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

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

Merge commit 'a1335149fd610b16459d9281b611282cac51c950'

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

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

Merge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9'

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

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

Merge commit 'ac6d53589f3631ae08467c784fb371a15c957f01'

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

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

Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'

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

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

Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7'

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

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

avcodec/shorten: properly handle bitshift > 31

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

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>

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>

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>

avdevice/caca: switch to codecpar

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

fate: fix sample dependencies for fate-{a,v}filter tests

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>

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>

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>

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>

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>

avcodec/wmalosslessdec: do not discard last frame

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

avcodec/shorten: mark as AV_CODEC_CAP_SUBFRAMES

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

fate/exr : add test for PXR24 Float and tile uncompress

avcodec/exr: fix channel detection

lavf/avio: Remove linebreak from https warning.

avformat/mpegts: Remove unused argument from analyze()

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

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>

avcodec/shorten: add support for AIFF packing, not bitexact

Also report unsupported packing.

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

avcodec/shorten: fix decoding of very large (>2048) block sizes

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

lavf/rawenc: Add a raw gsm muxer.

lavf/gsmdec: Add raw gsm autodetection.

Fixes bug 555.

avcodec/pngdec: Fix alpha detection with skip_frame

Fixes Ticket4816

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

swscale/arm: add ff_hscale_8_to_15_neon

avcodec/shorten: fix decoding of files with number of samples lower than max_frame_size

Note that support of very big block sizes is not currently supported at all due
too flawed logic in decoder.

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

avcodec/shorten: remove useless if condition and comment, reindent

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

avformat/nistshperedec: add support for mu-law as sample-byte-format

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

avcodec/shorten: fix decoding of last frame

Previously it would be always discarded.

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

fate: Add test for Ticket 2397 (dvdsub)

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

sws/aarch64/yuv2rgb: honor iOS calling convention

y_offset and y_coeff being successive 32-bit integers, they are packed
into 8 bytes instead of 2x8 bytes.

See https://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html

> iOS diverges from Procedure Call Standard for the ARM 64-bit
> Architecture in several ways
[...]
> In the generic procedure call standard, all function arguments passed
> on the stack consume slots in multiples of 8 bytes. In iOS, this
> requirement is dropped, and values consume only the space required.
[...]
> Padding is still inserted on the stack to satisfy arguments’ alignment
> requirements.

avformat/nistspheredec: fix silly bug

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

avcodec/pngenc: check return value of av_frame_copy()

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

avcodec/pngenc: restore image size before copying frame

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

avcodec/shorten: if allocation fails reset max_frame_size

Otherwise crash happens.

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

avcodec: remove "get_buffer() failed" message

It is already provided by ff_get_buffer().

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

avformat: support shorten in nistshpere demuxer

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

doc/filters: add drawtext example

Show example which draws text at a random position, and switches positions every 30 seconds

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

avfilter: add remap filter

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

swscale/utils: Remove unused variable

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