Merge commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6'

* commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6':
  rtmpproto: Extend a comment to explain the prev_pkt arrays roles

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'

* commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68':
  xmv: Add more sanity checks for parameters read from the bitstream

Conflicts:
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '8583b14252deac71136f1dec231910abab0ba503'

* commit '8583b14252deac71136f1dec231910abab0ba503':
  rtmp: Support reading interleaved chunks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4'

* commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4':
  twinvqdec: Check the ibps parameter separately

See: b8dc5f8bb3b14bfd2289a0444c7b706299555d97
See: 98b377004d9c6fa1c1756c814efe9882b65f96b9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4'

* commit 'a4adabb460ace39783d707a5b3bbe28b4b5b9dc4':
  movenc: Write the moof atom in two passes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/mp: remove mp=pullup

The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avfilter/vf_pullup: make sure metric_plane is available

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Add an option for omitting the tfhd base offset

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_pullup: fix memleak of metrics for last PullupField

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avfilter/vf_pullup: change log level to error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avfilter/vf_pullup: remove junk_down nonsense

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avformat: Use av_reallocp() where suitable

Signed-off-by: Diego Biurrun <diego@biurrun.de>
lavc: add ff_u8_to_s8() for safe type punning of uint8_t to int8_t
Add a WebP decoder

Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
aacdec: Add support for Error Resilience syntax.

This does not add support for any error resilience tools.
aacdec: Add support for LD (Low Delay) AAC
avfilter/vf_telecine: remove redudant av_frame_copy_props()

It is already called by av_frame_clone().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
doc/APIchanges: Fix two hashes

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
fate: Fix exif tests ffprobe dependency

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
matroskaenc: Write muxingapp and writingapp elements when using bitexact flag

Files won't validate with mkvalidtor if these two elements are missing.
Use a const "Lavf" string that wont change with library version bumps.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>