sparc: dsputil_vis: Fix silly variable name search and replace typo
evrcdec: fix wrong condition

Fixes CID980005 and CID980004.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sparc: dsputil_vis: Fix silly variable name search and replace typo

Conflicts:
	libavcodec/sparc/dsputil_vis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Print mxf Universal Label if the user requested verbose logging.

Fixes ticket #2198
lavfi/amerge: make description consistent with documentation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
libfdk-aacenc: Actually check for upper bounds of cutoff

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
ffv1enc: better heuristic to calculate initial states

Slightly improves compression of 2pass files

Tested-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dynamic loading of shared faac library
Allow compilation using static x264 build
no Werror on implicit-function-declaration and missing-prototypes
custom icon and windows resource
use upstream version tag, my repo is always rebased