Merge commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d'

* commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d':
  configure: move the hardware accel libs' entries in the help text

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '5e2203448ab4cc8ea1d933b87f1b39b009201044'

* commit '5e2203448ab4cc8ea1d933b87f1b39b009201044':
  configure: improve the help text for external libraries

Only merged the explanation paragraphs. The removal of "enable/disable"
and "[no]" would create too much inconsistency and might cause
confusion.

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c'

* commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c':
  lavc: revert the Makefile part of 330177b

Merged-by: Clément Bœsch <u@pkh.me>

movenc: mark astronomical_body const string as static

lavd/decklink: Fix compile issue on OS X

Fixes #4124: Invalid argument '-std=c99' not allowed with 'C++/ObjC++'
C++ files fail to compile. This adds '-std=c++11' to CXX_FLAGS to fix.

Signed-off-by: Rick Kern <kernrj@gmail.com>

avcodec/ppc: fix broken build when compiling libavcodec with LLVM on PPC backend

This commit fixes a broken build when compiling libavcodec with LLVM
compiler. These assembly files use non-standard format that is only
supported by GCC compiler. It would be nice to use a common standard
format. With this patch, both GCC and LLVM can build and generate the
same objects.

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

avformat: Fix ff_interleaved_peek()

Fixes assertion failures in movenc

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

avformat/matroskadec: Call matroska_read_close() on header parsing error

Fixes memleak
Fixes Ticket5169

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

fate: add anequalizer test

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

Merge commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3'

* commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3':
  xtea-test: Use struct allocation functions from the API

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit '8131bd4c22ad59b040173f67a5b2edb75863e801'

* commit '8131bd4c22ad59b040173f67a5b2edb75863e801':
  blowfish-test: Use struct allocation functions from the API

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'a86ef80494d759807a5ef8dd12838f0690092e37'

* commit 'a86ef80494d759807a5ef8dd12838f0690092e37':
  blowfish-test: Return different values for different errors

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'b84f3a40034d28828c4ca639d012479a7eaace28'

* commit 'b84f3a40034d28828c4ca639d012479a7eaace28':
  movenc: Write 'loci' geotag metadata for 3gp and mp4

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'f12a705ee570e16ca692c66b62821a2dbdf82566'

* commit 'f12a705ee570e16ca692c66b62821a2dbdf82566':
  movenc: Factorize a function for finding a metadata entry and the associated language

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'daec1651f1c0f8f8e704db375a2ecb364a722fa1'

* commit 'daec1651f1c0f8f8e704db375a2ecb364a722fa1':
  movenc: Write ?xyz geotag metadata for mov files

This commit is a noop, see a3ec1d6abddb98f7c3d4f280d71e008e88a2d385

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'bc43131997a456ecdff160eab288395f5adb8d72'

* commit 'bc43131997a456ecdff160eab288395f5adb8d72':
  mov: Also export loci altitude

This commit is a noop, see 08b7d19deff96a0adae93ba7d585176036442f31

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b'

* commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b':
  mov: Append place name instead of overwriting for loci

This commit is a noop, see 1607f774949add9e93bba6f288c9c5bf2c10d880

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'

* commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3':
  mov: Fix parsing short loci

This commit is a noop, see 50393bce31a5618f5125aaaf97bb69886fc4261d

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'

* commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd':
  mov: Print reason of loci parsing failure

See 9e4f0cfc8ff4ab635ea12bdbd8d85d8bb1ba25f9

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'

* commit 'd34826c33d401929b2ff8aee161fd39ad0a73613':
  mov: Add a comment referring to the standard that defines the loci box

Merged-by: Clément Bœsch <clement@stupeflix.com>

avfilter/showcqt: set some frame properties

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

avcodec/flac_parser: Increase FLAC_MAX_SEQUENTIAL_HEADERS by 1

Fixes Ticket5343

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

Merge commit '72d621069fc301b431fac36b5281699a362562f2'

* commit '72d621069fc301b431fac36b5281699a362562f2':
  movenc: Add a missed const

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

Merge commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9'

* commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9':
  movenc: Add a test for VFR with b-frames, with a duration change at a fragment end

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'

* commit 'e1eb0fc960163402bbb4e630185790488f7d28ed':
  movenc: Use packets in interleaving queues for the duration at the end of fragments

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

avformat/g729dec: Fix av_log() formating string

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

avcodec/libx264: Remove unused variable

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

MAINTAINERS: purge a bunch of entries

This is definitely not complete.

Anton, Diego and Luca are still maintaining their code in Libav, but are
unwilling to do so in FFmpeg, so removing these entries will prevent
them from getting poked by our users.

Måns, Justin, Kostya and Jason left both projects a while ago.

Merge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'

* commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7':
  movenc-test: Test write_data_type

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

Merge commit '71852a1ba89abc8749e309d9d662c49d47e19531'

* commit '71852a1ba89abc8749e309d9d662c49d47e19531':
  matroskaenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

tests/api: add .gitignore

Fixes regression since 5d48e4eafa6c4559683892b8638d10508125f3cf

Merge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'

* commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401':
  movenc: Provide output bytestream markers for fragmented content

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'

* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
  flvenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'

* commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca':
  avio: Allow custom IO users to get labels for the output bytestream

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

lavc/mediacodec: increase buffer dequeue timeout when the codec needs to be drained

Increase buffer dequeue timeout when the codec needs to be drained as it
could happen that no input buffer is available when we receive a null
packet for the first time (meaning we are unable to signal end of stream
and mark the codec as draining).

Fixes potential loss of last frames after sending a null packet.

lavc/mediacodec: rely on buffer flags to detect end of stream

lavc/mediacodec: re-indent after previous commit

lavc/mediacodec: discard 0-sized buffers

Their only purpose is to carry the end of stream flag.

ffprobe: print stereo3d information

Based on 8e757716c61e0563a63829e30b02d5ba2a422ad6

See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.

ffprobe: refactor pkt side data printing

Merge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'

* commit '8e757716c61e0563a63829e30b02d5ba2a422ad6':
  avprobe: Print stereo3d information

This commit is not merged as it doesn't apply at all in our tree. The
two following commits will add the same feature.

Merged-by: Clément Bœsch <clement@stupeflix.com>

avcodec: remove libutvideo wrapper support

The 10-bit decoding support is available now in native decoder.

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

avcodec/sheervideo: fix YbYr format decoding

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

Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'

* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
  stereo3d: Add API to get name from value or value from name

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'd621b2f795684f7119057f986066060adbe84220'

* commit 'd621b2f795684f7119057f986066060adbe84220':
  lavf: Raw G.729 demuxer

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'

* commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
  fate: Update fate-lavf-ts after commit 393596f9d5

This commit is a noop, see c0ff42bf6468c7440568ec15c81edc52289f0c8a

Merged-by: Clément Bœsch <clement@stupeflix.com>

Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'

* commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8':
  tools: Port to codec parameters API

Merged-by: Clément Bœsch <clement@stupeflix.com>

avformat/mov: add more datatypes in metadata handling

Implement variable sized big-endian integers, since these are found
in files created by ARRI cameras.

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

Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'

* commit '393596f9d51134d6e45d81ae129223f4faea1232':
  mpegtsenc: stop impersonating ses in sdt

This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7 on
Libav side.

Merged-by: Clément Bœsch <u@pkh.me>

dshow: avoid duplicate NULL check before free

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

dshow: don't add two instances of same device to graphs

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

MAINTAINERS: Remove Linux / PowerPC maintainer

See: [FFmpeg-devel] PPC64: PowerPC Maintainer information is incorrect

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

fate: add apad test

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

lavc: fix previous merge

Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'

* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c':
  Move VLC and RL_VLC_ELEM structure definitions to a separate header

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'

* commit 'b23613268c6b56a8f9de7859562d82b4b88353d9':
  avconv_dxva2: use the hwcontext API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

hwcontext_dxva2: support P010 10-bit surfaces

fate: add test for amerge

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

Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'

* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
  hwcontext: add a dxva2 implementation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

avformat/flacdec: Fix seeking close to EOF

Fixes Ticket5428

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

avcodec/flac_parser: Raise threshold for detecting invalid data

Fixes regression from Ticket5428

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

lavc/get_bits: add a logging context to check_marker()

Based on d338abb664febbc2c7266af7818aab1f12dbc161

Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'

* commit 'd338abb664febbc2c7266af7818aab1f12dbc161':
  mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL

This commit is a noop.

Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'

* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
  Move check_marker() from get_bits to mpeg4videodec

Not merged, check_marker() is used in various other places in FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'

* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
  lavc: mark the old audio/video encoding API as deprecated

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'

* commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
  x86inc: Enable AVX emulation in additional cases

This commit is a noop, see e428f3b30cebbc2beafb3ff2972dbf8b47bc4a70

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'

* commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
  x86inc: Improve handling of %ifid with multi-token parameters

This commit is a noop, see 4bd5583acea5d65a2f8fd8fcd5ab7b404af23f45

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f'

* commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f':
  x86inc: Fix AVX emulation of some instructions

This commit is a noop, see 42be240ad6874fbc2b0e88a3ee133ece58d60692

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'

* commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc':
  x86inc: Fix AVX emulation of scalar float instructions

This commit is a noop, see 8dd3ee9dddcaf1d538252d77dd2af3ea139f4f96

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '8996515b137f962e3a8691241c285c96437b6c53'

* commit '8996515b137f962e3a8691241c285c96437b6c53':
  avpacket: fix setting AVPacket.data in av_packet_ref()

This commit is a noop, see ed3a02547c71ac06fa27f17ad53116a74f78d927

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'

* commit 'e62ff72fc1052273deb708ba715f73e5187281d4':
  lavc: make avcodec_open2() fail when the timebase is not set for encoding

Merged-by: Clément Bœsch <u@pkh.me>

avcodec/tests/options: Set timebase

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

Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'

* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
  Combine deprecation guards where appropriate

Merged-by: Clément Bœsch <clement@stupeflix.com>

lavf/img2dec: add pnm pipe demuxers

avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed

The internal avctx bitrate is copied into codecpar after estimate_timings()

Fixes Ticket5646

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

avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()

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

swr: fix time.h include

Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'

* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>

libavformat/matroskaenc: omit segment UID for webm

SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUID

Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'

* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>

lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard

lavc/error_resilience: remove unused skip_last_mv label

Unused since a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886

Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'

* commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b':
  Add some more deprecation guards

- psnr() deprecation is not merged within ffmpeg.c as we still use it in
  non-deprecated code

- the XVMC chunk is not merged as we still apparently maintain it

- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.

Merged-by: Clément Bœsch <clement@stupeflix.com>

lavc/videotoolbox: fix avcC extradata creation

Fixes properly ticket #5638.

Since 772ad7142dff590c7bb30370acf5d3c9a8fb512b PPS and SPS contain the
nal type byte.

This reverts commit b8d754c5d0a2e99022c27bd1159ea3f597f67452.
This reverts commit 8e47a99f576da10b2a36e33b6b9acbf1c2da7485.

avformat/flvdec: Do not check last size if it could not be read due to EOF

Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/flvdec: Also print sum_flv_tag_size on size mismatches

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

avformat/flvdec: Accept last size if its off by 1

Fixes part of Ticket5648

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

Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'

* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
  Reduce the scope of some variables

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'

* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
  rtsp: Parse SSRC attributes in the SDP

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'

* commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
  rtpdec: Always check if we have the next packet queued

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'

* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
  avconv_vaapi: fix double-free with some unsupported streams

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'

* commit '885a9d6087315a85d98f7e89656ef01dc7104c4c':
  pgssub: Fix subpicture colorspace and range

See 9779b6262471d553c1ed811ff7312564e39d8adf

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52'

* commit '1f77e634bb838f71ff21923b5e9fe3104c831c52':
  colorspace: Add support for BT709

See 9779b6262471d553c1ed811ff7312564e39d8adf

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'

* commit '283226e11ccf50a71d25d150fbbf1743f74c6c49':
  simple_idct_template: Fix strict aliasing violation

See 5df703aa1b03814e9cd216ab703501481166b3bb

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'

* commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92':
  avio: Remove a leftover comment

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'

* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
  Mark read-only tables as static

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'

* commit '1f1ad8ace040a08edc2646ff638ca42a8828779f':
  configure: Document --enable-libfontconfig

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'def03d14687b9d089950ba8e45083e666de4eb68'

* commit 'def03d14687b9d089950ba8e45083e666de4eb68':
  vf_frei0r: Drop overly verbose and broken debug output

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>

avformat/mpegts: include stream type for aac

this removes the need to probe to discover aac streams
inside mpegts containers, thus speeding up initial playback.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>