Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Use 0x88 as stream id when muxing DTS in program streams.

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

* commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1':
  tcp: Explicitly convert a pointer to a boolean integer

Conflicts:
	libavformat/tcp.c

See: 22fbc7f8becdee1fd6ab7cac93ae23d6022e9a56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'

* commit '8b524ab0c43c1767919530abb79d3656113cdc47':
  movenc: Add a warning message if conflicting options have been specified

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Simplify setting the fragmentation flag

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat: Use av_reallocp_array() where suitable

Signed-off-by: Diego Biurrun <diego@biurrun.de>
fate.sh: Run git-clone quietly
doc: Drop VDPAU from list of supported codecs
Drop pointless directory name prefixes from #includes in the current dir
avformat/riff: add 0x594a TwoCC

sample:

http://samples.mplayerhq.hu/game-formats/wc4-xan/crusader-no-regret.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Make avcodec_find_best_pix_fmt_of_list const-correct

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/avfilter: fix null pointer dereference with queued ping filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: print command replies starting on column 0

This fixes formating issues with multi-line replies

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: improve built in docs for passing commands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vp56: use av_reallocp_array() and check if allocation failed

Signed-off-by: Paul B Mahol <onemda@gmail.com>
doc: Rename avtools-common-opts to fftools-common opts

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_psnr: >8 bit planar support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavc/utils: Add support for discarding samples from the end

Adding support for discarding samples from the end based on the value in
AV_PKT_DATA_SKIP_SAMPLES side data's bytes 5-8.

Signed-off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
opus/matroska: Adding support for End Trimming in demuxer/decoder

Implementing support for end trimming Opus in Matroska by making
use of the DiscardPadding value from the container and discarding
the samples accordingly.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavcodec: Adding support for End Trimming in Opus encoder

Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>