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

Commit deadcf5e misplaced a hunk.

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

~15% faster than sse2
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Lou Logan <lou@lrcd.com>

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

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

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

Fixes memleak
Fixes CID1231989
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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.