Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  ivi_common: check that scan pattern is set before using it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '07acdd65':
  ivi_common: use proper logging context in ivi_decode_blocks().
  ivi_common: make some functions and tables static.
  asyncts: ignore min_delta only if first_pts is set

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0dc57f1':
  asyncts: merge two conditions
  x86inc: fully concatenate tokens to fix macro expansion for nasm
  h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6a27ae28':
  mpegvideo: treat delayed pictures as used

Conflicts:
	libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bd255f9f':
  lavc: set frame parameters after decoding only if necessary

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

This code is now executed in h264_set_parameter_from_sps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '072be3e8':
  h264: set parameters from SPS whenever it changes
  asyncts: cosmetics: reindent

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

* commit 'b35e5d98':
  doc: improve documentation for the asyncts filter first_pts option
  asyncts: fix the asyncts behavior when using the first_pts option

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

* commit '8083332c':
  asyncts: use clipped delta value when setting resample compensation
  asyncts: fix flushing of final samples at EOF
  vp6: properly fail on unsupported feature
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CVE-2012-2791.

CC: libav-stable@libav.org

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

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

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

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

Fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes build errors with nasm introduced in 6f40e9f0 for stack
memory alignment. Noticed by BugMaster.

The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seek to header fails.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Consistent with the image2 muxer.

Factorize.

This requires to move the avcodec_default_free_buffers() call to
ff_MPV_common_end() since otherwise delayed pictures would get freed
during a size change.

Direct rendering capable decoders call get_buffer() which will set the
frame parameters.

Prevents frames with wrong parameters when a decoder outputs delayed
frames after a resolution or pixel format change.

Fixes a crash in the fuzzed sample sample_varPAR.avi_s26638 with
alternating bit depths.

Note the time base for the option. Add an additional example description.

The max_comp option is supposed to limit maximum compensation, but
currently the clipped value is not actually used.

Currently it will do padding, but it does not properly handle
start-of-stream trimming as documented.

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

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

Interlacing is not supported at all and mismanaged down the normal
codepaths causing possible buffer management issues.

CC: libav-stable@libav.org

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