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)
commitd12bc01ec55a78b33ab9bef8377ae6adff03354a
tree83492fd83fad0da53ed7d6e36b935faab74f3d96
parent8da4305eb520bb4624df633ef124089fcfba8e6d
parent62cc7a91080194d9ead162516f779f20931220d9
Merge commit '62cc7a91080194d9ead162516f779f20931220d9'

* commit '62cc7a91080194d9ead162516f779f20931220d9':
  rtjpeg: return meaningful error codes

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