[FFmpeg-cvslog] Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 13:41:40 2013 +0200| [f302ba4ddab75d217e1ed63d15a56ef4e6e799b3] | committer: Michael Niedermayer

Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'

* commit 'db9aee6ccf183508835acc325f5ad87d595eacc4':
  oma: properly forward errors in oma_read_packet

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

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