[FFmpeg-cvslog] Merge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 13:37:21 2013 +0200| [d13bc208da3b4a7d058d96fad884f272c9647eb9] | committer: Michael Niedermayer

Merge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0'

* commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0':
  oma: return meaningful errors

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

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