caf: Give context structure a consistent name
avformat: add SUP/PGS subtitle demuxer

Signed-off-by: Clément Bœsch <u@pkh.me>
avformat/srtdec: simpler and more lenient probing

Fixes Ticket #3935.
pcm-dvd: Move a variable to a smaller scope

This avoids an unused variable warning on big-endian systems.
lavd/avfoundation: Use microseconds as common timebase.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

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

* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
  pcm-dvd: Move a variable to a smaller scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/dxtory: remove unused variables

Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/iff: print error message when DSDIFF compression type is not supported

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vc1: Use logical instead of bitwise or for coded_inter

This appears to be the intended behavior.
vc1: Use logical instead of bitwise or for twomv

CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
fate: Add VC-1 interlaced twomv test

CC: libav-stable@libav.org
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Some encoders already use this value even
though it's reserved in the A/52 specification.
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

This is actually defined in the A/52 specification.
flac: Remove unused headers

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

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

* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
  vc1: Use logical instead of bitwise or for twomv

See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
log: Unbreak no-tty support on 256color terminals
probe: Bump the score for mime type matching

It should be more trustworthy than extension matching.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
avconv: Use only audio and video to guess discontinuities

Data and subtitle streams might cause false positive.