[FFmpeg-cvslog] Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 18 11:04:11 2013 +0200| [0718f0cc24bc8413cd0cf44fcf000f0e52a67522] | committer: Michael Niedermayer

Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'

* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0718f0cc24bc8413cd0cf44fcf000f0e52a67522
---