Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 08:04:53 +0000 (10:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 08:05:00 +0000 (10:05 +0200)
commitb53d6a47c51a54bb830de14fc742a9284f612745
tree56f0c4cafc09026c36d4ad4f4c3c93eeb9249461
parent5918b7ac4116a8d579269f0186f8dc78ed34d6df
parenta5a0ef5e13a59ff53318a45d77c5624b23229c6f
Merge commit 'a5a0ef5e13a59ff53318a45d77c5624b23229c6f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeglsdec.c
libavcodec/sparc/vis.h