Reviewed-by: James Almer <jamrial@gmail.com>
Approved-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '67a7695c':
  avfilter: Remove unused variable from ff_get_video_buffer()

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

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

They should match but they do not always
Fixes assertion failure
no testcase with unmodified source available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The messages regarding the recommended use of bitstream filters are somewhat different.
This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb".
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b977b287':
  vsrc_movie: Avoid a variable indirection in movie_get_frame()

Conflicts:
	libavfilter/src_movie.c

no change as theres no such code in src_movie.c in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* 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>

This avoids an unused variable warning with MSVC since the variable is
only used in a debug mode printf statement.

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>