Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'

* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
  h264dec: K&R formatting cosmetics

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

* qatar/master:
  h264dec: Add .avc file name extension

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Remove '-vf' from pullup documentation example.
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow encoding YUVJ422P and YUVJ444P with libx264.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
matroska: Add the CueDuration element

Use it only on subtitle CuePoints.
With proper demuxer/splitter support this should improve the display
of subtitles right after seeking to a given point in the stream.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tools: Fix apparent merge failure
avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavfi/pad,crop,scale: remove options description from filter description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/fraps: use BT.709 colorspace for YUV Fraps versions

Based both on comparison to the reference decoder, and comments from
the fraps developers upon inquiry how to handle the yuv fraps variants.
avutil/cpu: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avdevice/v4l: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavu/attributes: Don't define av_restrict

This is always defined in config.h.

Original patch by Derek Buitenhuis.
lavf/libssh: add MAINTAINERS entry

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/network: fix duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec: fix duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavu: Add interleaved 4:2:2 8/10-bit formats

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
avformat/hls: do not limit manifest lines to 1024 chars

Fixes Ticket2976
Debuged-by: jaimeMF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil: Fix compilation with inline asm disabled on mingw

Because of -Werror=implicit-function-declaration the build will fail.

Signed-off-by: Martin Storsjö <martin@martin.st>