configure: Disable i686 for i586 and lower CPUs
dca: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
tools/crypto_bench: fix build when AV_READ_TIME is unavailable

Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add a closing LF to Webm-manifest files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils: Print a more sensible message in show_filters() w/o libavfilter

Also avoid an unused variable warning for compilers w/o av_unused support.
Merge commit '9030c58a780a02fb8256cb75cd39275eaad786d1'

* commit '9030c58a780a02fb8256cb75cd39275eaad786d1':
  configure: Disable i686 for i586 and lower CPUs

See: cdb3eee7c496f763d195de34be7f67783b98fb2c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'

* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
  dca: K&R formatting cosmetics

Conflicts:
	libavcodec/dca_parser.c
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/ass: make sure the log level are in available range
avfilter/ass: better log level mapping
avfilter/ass: add shaping option

The documentation is mostly based on ass.h public header.
ffplay: factorize frame queue operations

Create a generic frame and a frame queue struct to handle video picture queues
and subtitle picture queues with common code. Also add the possibility to queue
AVFrames, however at the moment we only use SDL_Overlay buffers for video and
AVSubtitles for subtitles.

Signed-off-by: Marton Balint <cus@passwd.hu>
ffplay: use frame queue to determine last used pos

Signed-off-by: Marton Balint <cus@passwd.hu>
Revert "avformat/rtpproto: fix strict aliasing violations with sockaddr"

It appears this breaks build with MSVC
until someone who has MSVC setup has time to investigate and
workaround/fix this, its better to revert so that build is not broken
Thats even more so as the original commit only fixed a hypothetical issue

This reverts commit e587a428d75d58e2e5a592efd7bff44e1d9294ee.
doc/filters: add geq gradient examples

Radial gradient by Víctor Paesa. Linear gradient by Paul Gentemann.

Also-by: Víctor Paesa <victorpaesa@googlemail.com>
Also-by: Paul Gentemann <beriukay@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
avformat/avienc: Dont search for startcodes in inserted empty avi frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: use frame queue to determine last used pos
  ffplay: factorize frame queue operations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffplay: try to fix build failure on apple

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft

Signed-off-by: James Almer <jamrial@gmail.com>
doc/filters: remove aconvert

Signed-off-by: Paul B Mahol <onemda@gmail.com>
x86/me_cmp: port mmxext and sse2 sad functions to yasm

Also add a missing c->pix_abs[0][0] initialization, and sse2 versions of
sad16_x2, sad16_y2 and sad16_xy2 (%15 to %20 faster than mmxext).
Since the _xy2 versions are not bitexact, they are accordingly marked as
approximate.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>