* commit '6af29302':
  pcm: Drop av_unused attribute from variable that is always used

Conflicts:
	libavcodec/pcm.c

No change as there is no such av_unused variable in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '14d2006c':
  pcm: Drop unused variable from DECODE_PLANAR macro

Conflicts:
	libavcodec/pcm.c

No change as the changed code isnt in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd456baaf':
  vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

Conflicts:
	libavcodec/vc1dec.c

See: 1e2ab984Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8bc52dbd':
  vfwcap: Drop fallback VfW defines

Conflicts:
	libavdevice/vfwcap.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '86dfcfd0':
  mov: Drop unused parameter from ff_mov_read_esds()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The allocation didn't account for headers, that can be easily 79 bytes.
As a result, buffers allocated for a few samples (e.g. 5 in the original
bug) could be undersized.

Fixed ticket #2881.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

based on patch from hlszl1983@163.com
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The defines were added long ago when MinGW still lacked them.

This is cleaner and avoids an uninitialized variable warning with MSVC.

avcodec/proresenc_kostya: allocate 1 slice more to avoid triggering the reallocation warning when the used space is actually less than the allocated
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

If the initial max_slice_size is 0 then reallocation is disabled for the first
slice.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Not actually used in huffyuvenc, but rather in setting the frame
threading.

Example for some files:
context=0:       851974   27226   1137281
context=1,ND=0:  471819   22604    972351
context=1,ND=1:  472875   22673    972582
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3829
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

PulseAudio expilitly requires name of the source.
This patch makes it use default source when not provided.
It simplifies programistic use.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Prior to 56.1.100, incorrect ALAC files for 24bps content were produced, in
particular not decoding losslessly.

Add an option to allow correctly decoding those streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '41e1354c':
  proresenc: Properly account for alpha plane

Conflicts:
	libavcodec/proresenc_kostya.c

See: 117bc8e6Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '45ce880a':
  proresenc: Realloc if buffer is too small
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58b68e4f':
  proresenc: Report buffer overflow

Conflicts:
	libavcodec/proresenc_kostya.c

See: 52b81ff4Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b16699f2':
  proresenc: Remove unneeded parameters from encode_alpha_plane()

Conflicts:
	libavcodec/proresenc_kostya.c

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

* commit '12640e4c':
  tiff: Return proper error for missing LZMA compression
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'dd35d451':
  doc: Change wrong term to avoid confusion

Conflicts:
	doc/developer.texi

No change, as the wrong term is not part of our docs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

The packet buffer allocation considers the alpha channel as DCT-coded,
while it is actually run-coded and thus requires a larger buffer.

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The buffer allocation may be incorrect (e.g. with an alpha plane),
and currently causes the buffer to be set to NULL by init_put_bits,
causing a crash later on.

So, detect that situation, and if detected, reallocate the buffer
and ask for a sample that shows the problem.

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

If the allocated size, despite best efforts, is too small, exit
with the appropriate error.

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

For now only first frame is decoded.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

The LZMA support is a semi-official extension supported by libtiff 4.0.0
and later.
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The reasoning behind this addition is that various third party
applications are interested in getting some motion information out of a
video "for free" when it is available.

It was considered to export other information as well (such as the intra
information about the block, or the quantization) but the structure
might have ended up into a half full-generic, half full of codec
specific cruft. If more information is necessary, it should either be
added in the "flags" field of the AVMotionVector structure, or in
another side-data.

This commit also includes an example exporting them in a CSV stream.

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

Fixes Ticket #3865
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>

A function declaration is the prototype.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>