Merge commit '62cc7a91080194d9ead162516f779f20931220d9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 09:51:28 +0000 (11:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 09:51:42 +0000 (11:51 +0200)
* commit '62cc7a91080194d9ead162516f779f20931220d9':
  rtjpeg: return meaningful error codes

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

Simple merge