Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 08:22:20 +0000 (10:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 08:22:39 +0000 (10:22 +0200)
commit7d84bb2bcca85c37dc2252f0dc5d585ee9c0011f
treef184682d44a153af480fa3dacf1edf4a3c15785a
parentb53d6a47c51a54bb830de14fc742a9284f612745
parent4a4107b48944397c914aa39ee16a82fe44db8c4c
Merge commit '4a4107b48944397c914aa39ee16a82fe44db8c4c'

* commit '4a4107b48944397c914aa39ee16a82fe44db8c4c':
  jpegls: factorize return paths

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