[FFmpeg-cvslog] Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 18 10:04:53 2013 +0200| [b53d6a47c51a54bb830de14fc742a9284f612745] | committer: Michael Niedermayer

Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'

* commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f':
  jpegls: return meaningful errors
  sparc: VIS mnemonics

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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