* commit 'bc8c1cdc':
  lavfi doxy: add a page for lavfi.
  jpegls: check the scan offset

Conflicts:
	libavcodec/jpeglsdec.c
	libavfilter/avfilter.h
	libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>