[FFmpeg-cvslog] Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  1 11:31:16 2013 +0200| [43229d609a1796cce3537932539439529b134b9b] | committer: Michael Niedermayer

Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'

* commit '7388c0c58601477db076e2e74e8b11f8a644384a':
  indeo: Properly forward the error codes

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

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