avframe: note that linesize is not the usable data size
lavfi: allow user-provided execute() callbacks
Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'

* commit '38e15df1489d86c016515223ee693e7d0326c56a':
  avframe: note that linesize is not the usable data size

Conflicts:
	libavutil/frame.h

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

* qatar/master:
  lavfi: allow user-provided execute() callbacks

Conflicts:
	libavfilter/avfilter.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Convert multiplier for MV from int to ptrdiff_t.

This prevents emulated_edge_mc from not undoing mvy*stride-related
integer overflows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libopenjpeg: fix encoding of odd sized subsampled images

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/dualinput: remove unused variable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avformat/vfq: fix deadlock in vqf_read_header()

Fixes #3010.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
avformat/utils: factor find_decoder() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf/mxfdec: add j2k codec to intra only codecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vp8: use 2 registers for dst_stride and src_stride in neon bilin filter.
Rewrite emu_edge functions to have separate src/dst_stride arguments.

This allows supporting files for which the image stride is smaller than
the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file
or a 16x16 VP8 file with -fflags +emu_edge.
Remove an incorrect and unneeded assert in the amr demuxer.

Asserting a specific codec is not correct since libavformat
allows forcing a codec, an equivalent check is in the
following line.

Fixes ticket #3001.
avcodec/tiff_common: add ff_tadd_bytes_metadata()

The le argument is passed so the function has the same prototype as the
other similar functions. It is otherwise unused

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/exif: print bytes and undefined types as scalar lists

This prevents odd characters from ending in the fate test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Revert "fate: Force diff into text mode"

This should fix AIX and should no longer be needed

This reverts commit b78e75ebc9b03bea8f0c48da266ee6cc0fb8e22d.
avformat/mxfenc: instance number is just 24 bits

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegenc: fix muxrates AVOption maximum value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegenc: check, warn and clip VBV value to within syntactically possible values

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