Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:04:11 +0000 (11:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:04:11 +0000 (11:04 +0200)
commit0718f0cc24bc8413cd0cf44fcf000f0e52a67522
treedc51169ff43d27c18b9e87faf49d7ced1149a8ba
parent7d84bb2bcca85c37dc2252f0dc5d585ee9c0011f
parentbc8c1cdc7bfe7b1fe56df812aabdac3de2555cec
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@gmx.at>
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavfilter/version.h
libavutil/avutil.h