[FFmpeg-cvslog] Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 15 13:18:07 2013 +0200| [e3b13c108160869a2dddd1d5bfd42b0b9c917d43] | committer: Michael Niedermayer

Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'

* commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5':
  indeo5: return proper error codes

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

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