Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h261: Move mvmap table to the only place it is used

Conflicts:
libavcodec/h261data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '0404ec619d43f27b87c424aa1a572a6699fe6a31'

* commit '0404ec619d43f27b87c424aa1a572a6699fe6a31':
  h261: cosmetics: Move functions to avoid forward declarations

Conflicts:
libavcodec/h261dec.c
libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'

* commit 'b78f81c8033904e2e75add0c9a603df6df514a30':
  h261: K&R formatting and prettyprinting cosmetics

Conflicts:
libavcodec/h261_parser.c
libavcodec/h261data.h
libavcodec/h261dec.c
libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780'

* commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780':
  h261: Move function declarations to h261.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1'

* commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1':
  h261: Remove H.261 loop filter from dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ae35d91d44c5e676af3d146bf8d05b241c467675'

* commit 'ae35d91d44c5e676af3d146bf8d05b241c467675':
  h261: Move ff_h261_rl_table_store declaration to header file

Merged-by: Michael Niedermayer <michaelni@gmx.at>

fix bug of finding CPU device

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

img2dec: make use of AV_OPT_TYPE_IMAGE_SIZE

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

img2dec: make use of AV_OPT_TYPE_VIDEO_RATE

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

rawvideodec: make use of AV_OPT_TYPE_IMAGE_SIZE

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

rawvideodec: make use of AV_OPT_TYPE_VIDEO_RATE

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

rawdec: make use of AV_OPT_TYPE_VIDEO_RATE

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

bintext: make use of AV_OPT_TYPE_IMAGE_SIZE

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

bintext: make use of AV_OPT_TYPE_VIDEO_RATE

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

x86: sbrdsp: implement SSE neg_odd_64

Timing on Arrandale:
        C   SSE
Win32:  57   44
Win64:  47   38
Unrolling and not storing mask both save some cycles.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x264asm: fix cmp* number of arguments

cmp{p,s}{s,d} instructions do take an imm8 operand.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tty: make use of AV_OPT_TYPE_IMAGE_SIZE

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

tty: make use of AV_OPT_TYPE_VIDEO_RATE

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames

Conflicts:
libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters: clarify example explanation

doc/filters: fix old broken syntax of color source in overlay example

Found-By: littlebat <dashing.meng@gmail.com>

Merge commit '8c65264595d5a82c56ae5043320e4b875a414229'

* commit '8c65264595d5a82c56ae5043320e4b875a414229':
  pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
  img2: Add j2k file extension for JPEG 2000

Conflicts:
libavutil/pixfmt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

h261: Move mvmap table to the only place it is used

h261: cosmetics: Move functions to avoid forward declarations

h261: K&R formatting and prettyprinting cosmetics

h261: Move function declarations to h261.h

h261: Remove H.261 loop filter from dsputil

There is no arch-optimized version of the H.261 loop filter and there
likely will never be, so the dsputil overhead does not give any benefit.

h261: Move ff_h261_rl_table_store declaration to header file

cmdutils: remove error message from opt_default() in case of missing option

A similar error message is generated by the calling function, avoid
duplication and spurious error message occurring with negated boolean
options introduced in 8bb5680, which can be reproduced for example with
the command:
ffmpeg -f lavfi -i testsrc=d=0.1 -nostdin -f null -

doc: enable compilation of -all tool pages

In particular, add documentation configuration system, through the
doc/config.texi file.

Fix trac issue #2374.

doc: move ffmpeg-scaler.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

doc: move ffmpeg-resampler.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

doc: move ffmpeg-devices.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

doc: move ffmpeg-formats.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

doc: move ffmpeg-codecs.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

lavfi/blend: use standard options parsing

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

lavfi/noise: use standard options parsing

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

lavfi/afade: use standard options parsing

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

rtpdec: Increase max rtp packet size to 8192

Fixes Ticket2314
Fixes connecting to "Ceton InfiniTV4 PCIe & USB"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters: fix erroneously truncated comment on a scale example

doc/filters: put separated geq variables in separate lines

Make clear that they are not aliases for the same variable.

xbmenc: remove unused code

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

xwdenc: remove unused code

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

bmpenc: get rid of BMPContext as it is unused

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

lavfi/smptebars: fix invalid writes

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

doc: document -v repeat

Thanks-to: Derek Buitenhuis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: use packet duration for subtitles if necessary.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames

Signed-off-by: Diego Biurrun <diego@biurrun.de>

pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values

Signed-off-by: Diego Biurrun <diego@biurrun.de>

img2: Add j2k file extension for JPEG 2000

Signed-off-by: Diego Biurrun <diego@biurrun.de>

avutil/opencl: replace assert by check and error message in av_opencl_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/opencl: check strtol for failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/opencl: add check for the program number to create kernel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/blend: add N variable

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

lavfi/smptebars: fix output for subsampled yuv

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

matroskadec: Check EBML lace sizes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskadec: Check for overflows in xiph lace decoding

This also detects errors earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskadec: fix return code for too long xiph laces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dfa: remove redundant check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xmv: do not leak memory in the error paths in xmv_read_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'

* commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c':
  xmv: check audio track parameters validity.
  bmv: check for len being valid in bmv_decode_frame().

Conflicts:
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavc: use packet duration for subtitles if necessary.

Fix trac ticket #2397.

Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'

* commit '8d617b11cfc87b2c6056fee029ac5bc760af874a':
  id3v2: pad the APIC packets as required by lavc.
  dfa: check for invalid access in decode_wdlt().

Conflicts:
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'

* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
libavformat/utils.c

See: 44a7a6300d104dd453bcd5c601e9c6944fb34679

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'

* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
  opt: check the return values of av_get_token for ENOMEM.
  doc: Fix best_nb_channells typo
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8a96df7b70be509dae9ceec82d2c10a20361356d'

* commit '8a96df7b70be509dae9ceec82d2c10a20361356d':
  matroska: fix a corner case in ebml-lace parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'fc43c19a567aa945398dccb491d972c11ec2a065'

* commit 'fc43c19a567aa945398dccb491d972c11ec2a065':
  matroska: Update the available size after lace parsing
  clang: use -fsantize=address and -fsanitize=thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/ffprobe: fix references in See Also section

xmv: do not leak memory in the error paths in xmv_read_header()

CC: libav-stable@libav.org

xmv: check audio track parameters validity.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

bmv: check for len being valid in bmv_decode_frame().

It can be 0 or -1 for invalid files, which may result in invalid memory
access.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

id3v2: pad the APIC packets as required by lavc.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

dfa: check for invalid access in decode_wdlt().

This can happen when the number of skipped lines is not consistent with
the number of coded lines.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

lavf: make sure stream probe data gets freed.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avfiltergraph: set deprecated filter_count.

opt: check the return values of av_get_token for ENOMEM.

doc: Fix best_nb_channells typo

Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

oggdec: Support byte based seeking

Fixed Ticket2317

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat: Add a mechanism to allow demuxers to detect byte based seeking.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.

Tested-by: Nevcairiel

matroskadec: fix display_width/height = 0 handling

Fixes Ticket2424

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/fate.texi: fix typo

doc/filters: fix error in blend description

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: do not init frame with guessed layout.
  lavfi/af_atempo: simplify request_frame loop.
  lavfi/af_asetnsamples: simplify request_frame loop.
  lavfi/f_ebur128: remove request_frame hack.
  lavfi/vf_tile: simplify request_frame loop.
  lavfi: reindent after last commit.
  lavfi: loop on request_frame if necessary.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavc: do not init frame with guessed layout.

It is breaking support from files with unknown layout.

lavfi/af_atempo: simplify request_frame loop.

lavfi/af_asetnsamples: simplify request_frame loop.

lavfi/f_ebur128: remove request_frame hack.

lavfi/vf_tile: simplify request_frame loop.

lavfi: reindent after last commit.

lavfi: loop on request_frame if necessary.

Some filters need several input frames before producing output.
For these filter, it becomes simpler to return 0 in
request_frame() and let the framework call it again until
output has been produced.

Skip padding in an id3 tag in aiff files.

Fixes ticket #2430.

Reviewed-by: Matthieu Bouron

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders without opencl headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fix make checkheaders without opencl headers.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '817dff578f13ce97576c609ab141508b9dc782e9'

* commit '817dff578f13ce97576c609ab141508b9dc782e9':
  configure: Check for the atomic.h functions used in the suncc atomics header

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

smacker: fix off by one error

Regression since a93b572ae4f517ce0c35cf085167c318e9215908.

Fixes #2426.

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

Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'

* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
  configure: prettify atomics handling.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/afade * biquads: call av_frame_copy_props()

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