vf_fieldorder: cosmetics, remove an extra linebreak
vf_fieldorder: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_format: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_frei0r: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_gradfun: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_hflip: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_hqdn3d: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_libopencv: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_lut: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_overlay: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_pad: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
mjpegdec: properly report unsupported disabled features

When JPEG-LS support is disabled the decoder would feed the
data to the JPEG Lossless decode_*_scan function resulting in
faulty decoding.

CC: libav-stable@libav.org
flacdec: drop unnecessary assert

The condition cannot happen anymore.
sparc: Eliminate dead code in VIS acceleration macros

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'

* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8':
  vf_frei0r: use the name 's' for the pointer to the private context
  vf_format: use the name 's' for the pointer to the private context
  vf_fieldorder: use the name 's' for the pointer to the private context
  vf_fieldorder: cosmetics, remove an extra linebreak

Conflicts:
	libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'

* commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8':
  vf_libopencv: use the name 's' for the pointer to the private context
  vf_hqdn3d: use the name 's' for the pointer to the private context
  vf_hflip: use the name 's' for the pointer to the private context
  vf_gradfun: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_gradfun.c
	libavfilter/vf_hflip.c
	libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_pad: use the name 's' for the pointer to the private context
  vf_overlay: use the name 's' for the pointer to the private context
  vf_lut: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sparc: Eliminate dead code in VIS acceleration macros
  flacdec: drop unnecessary assert
  mjpegdec: properly report unsupported disabled features

Conflicts:
	libavcodec/flacdec.c
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rename ffadler to ffhash and expand it using the generic hash API

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