Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'

* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
  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>

sauce: test filetype correctly for datatype 5 (binary text)

mem: minor simplification of the alignment hack code

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

audioconvert/arm: require alignment of 16

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

audioconvert: support simd code with specific alignment requirements.

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

configure/arm: print if thumb mode is enabled

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

g729dec: check pitch_delay_int.

Fix out of array read

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

nuv: dont try to copy an empty frame

Fixes assertion failure

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

flvenc: don't write random data if seek fails

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>

docs: -asyncts has been replaced by aresample not asyncts in ffmpeg

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

lavf/segment: add segment_start_number option

Consistent with the image2 muxer.

lavf/segment: add function set_segment_filename()

Factorize.

asyncts: use clipped delta value when setting resample compensation

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

asyncts: fix flushing of final samples at EOF

aresample: increase n_out buffer size a bit to reduce delay in some corner cases

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

mpegts: check av_new_stream() return value.

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

vp6: properly fail on unsupported feature

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

CC: libav-stable@libav.org

qt-faststart: Check offset_count

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

cavsdec: check ff_get_buffer() return value

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

snowenc: check ff_get_buffer() return value

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

svq1enc: check ff_get_buffer() return value

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

alsdec: propagate error codes in read_block()

Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

alsdec: make return checking for read_*_block_data() consistent

Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

alsdec: Use AVERROR_INVALIDDATA in read_const_block_data

Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mips: ac3 downmix updated to the new data layout.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/matroskaenc: check for overflow in display width.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
libavcodec/aacdec.c

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

Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667'

* commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667':
  rtpdec_mpeg4: Cosmetic cleanup
  rtpdec: Cosmetic cleanup of the header
  rtpdec: Get rid of a useless _s suffix on a struct name

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

Merge commit '7941159df6aad2d219e2a7184489be7a735dd944'

* commit '7941159df6aad2d219e2a7184489be7a735dd944':
  rtpdec/enc: Remove outdated/useless/misleading comments
  rtpdec: Improve some comments
  rtpdec: Remove unused context variables
  rtpdec: Limit writing to the buffer size
  svq1: Fix building with -DDEBUG
  svq1: return meaningful error codes.

Conflicts:
libavcodec/svq1dec.c

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

Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'

* commit '998fdcff41bbda8ef13c991743376556f910efa9':
  lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
  svq1: unmacroify macros used only once.

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

Merge commit '95baf701db719ecad6b31000429e20eca2526ed6'

* commit '95baf701db719ecad6b31000429e20eca2526ed6':
  svq1: deMpegEncContextize

Conflicts:
libavcodec/svq1dec.c

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

lavfi: drop ff_null_start_frame/end_frame/draw_slice.

The functions have become unused

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

lavfi/select: assign NAN to ignored values

Also log scene value. Improve debugging.

lavfi/select: add support to options

Add options introspection, and improve error feedback.

lavfi/select: in select_frame(), rename picref -> ref

The variable is now used also for audio frames.

doc/filters: itemize select/aselect examples

Improve rendering.

lavfi: mv vf_select.c -> f_select.c

The file now contains also an audio select implementation. Also move the
aselect/select documentation from video filters to the multimedia filters
section.

lavfi: add aselect audio variant of select

lavfi/select: remove deprecated and unused poll_frame() callback

Simplify.

aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.

Found-by: pawlkt
CC: libav-stable@libav.org

lavf/matroskaenc: use integers to for display size.

Avoid rounding differences between x86_32 and x86_64.
Fix trac ticket #1997.

x86inc: fix stack alignment on win64

Signed-off-by: Martin Storsjö <martin@martin.st>

mpeg1video: fix regression with slices != threads

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

mpeg1video: support multi threaded slice encoding.

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

adpcm: fix off by 1 error and out of array access in DK4

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

msmpeg4dec: fix coeff index

Fixes assertion failure

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

read_gab2_sub: fix null pointer dereference

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

avfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if they are set

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

ffmpeg: sub2video: use start and end time.

Until now, the end_display_time was ignored, making single
packets subtitles (like dvdsub) stay indefinitely.

start_display_time was also ignored, but is it almost always 0.

rtpproto: Remove unused defines

Signed-off-by: Martin Storsjö <martin@martin.st>

ff_copy_buffer_ref: use the channel count

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

avfilter_get_video_buffer_ref_from_frame: check channel count

more than 8 channels is not supported and crashes with null pointer dereference

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

alsdec: check block length

Fix writing over the end

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

lavf/concatdec: avoid leaking URLs.

Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.

mxf_set_audio_pts: fix division by 0

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

oggspeexparse: fix array overread

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

rtpdec_mpeg4: Cosmetic cleanup

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Cosmetic cleanup of the header

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Get rid of a useless _s suffix on a struct name

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec/enc: Remove outdated/useless/misleading comments

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Improve some comments

The previous comment about the buffer was wildly inaccurate and
misleading.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Remove unused context variables

These stem from back when both the rtp muxer and rtp depacketizing
shared the same struct.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Limit writing to the buffer size

This fixes potential buffer overwrites.

Signed-off-by: Martin Storsjö <martin@martin.st>

svq1: Fix building with -DDEBUG

Signed-off-by: Martin Storsjö <martin@martin.st>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix segfault due to overlooked change needed in 14758e3
  x86inc: support stack mem allocation and re-alignment in PROLOGUE

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

x86inc: support stack mem allocation and re-alignment in PROLOGUE.

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

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

Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'

* commit '14758e3211d34a97c42b07acae117ce5627d7f57':
  lavr: temporarily store custom matrix in AVAudioResampleContext
  lavr: clarify documentation for avresample_get/set_matrix()

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

Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'

* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

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

swfdec: print warning when len is cliped

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

Fix frame-rate documentation.

svq1: return meaningful error codes.

lavc: replace some forgotten instances of PixelFormat with AVPixelFormat

svq1: unmacroify macros used only once.

svq1: deMpegEncContextize

This decoder is quite simple and none of the MpegEncContext complexity
is actually needed.

Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
libavformat/swfdec.c

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

lavr: fix segfault due to overlooked change needed in 14758e3

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

x86inc: support stack mem allocation and re-alignment in PROLOGUE

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

lavfi/showinfo: check plane count before dereferencing.

ac3dec: fix out of array read

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

cafdec: Check duration before use.

Fix division by 0

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

bfi: fix division by 0

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

Changelog: update for soxr

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

doc/ffmpeg: fix/extend documentation for -copyts

swr: Add SOX resampler support

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

swr: add a lowpass default so that each Resampler can have its own default.

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

swr: move flush into Resampler

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

swr: make realloc_audio() available outside swresample.c

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

swr: Add API to make resample engine selectable.

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

lavc/utils: Do not require dimensions for PNG.

pngenc doesnt need them and mplayer doesnt set them.

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

doc/filters: fix grammar mistake in setfield documentation

Spotted-by: Tim Nicholson <nichot20@yahoo.com>

lavr: temporarily store custom matrix in AVAudioResampleContext

This allows AudioMix to be treated the same way as other conversion contexts
and removes the requirement to allocate it at the same time as the
AVAudioResampleContext.

The current matrix get/set functions are split between the public interface
and AudioMix private functions.

lavr: clarify documentation for avresample_get/set_matrix()

lavfi/fps: remove parse opt error message.

See cc650cf0 for more info.

doc/filters: extend fps documentation.

lavfi/fps: add shorthand.

mxfdec: drop unneeded extradata padding

Found-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swfdec: cosmetics: fix indentation

swfdec: do better validation of tag length

Avoids trying to read a packet with 0 or negative size.
Avoids a potential infinite loop due to seeking backwards.

Partially based on a patch by Michael Niedermayer.

mxfdec: fix leak of extradata

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Make LOCAL_ALIGNED syntactically similar on all systems

This changes the LOCAL_ALIGNED definition on systems where
DECLARE_ALIGNED is used so it matches the manual alignment
case, ensuring invalid use will not compile on x86 only to
fail on everything else.

Signed-off-by: Mans Rullgard <mans@mansr.com>