Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 11:41:40 +0000 (13:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 11:41:45 +0000 (13:41 +0200)
commitf302ba4ddab75d217e1ed63d15a56ef4e6e799b3
tree33c1b4de23d79fe30c14036647970c0509d494c7
parentd13bc208da3b4a7d058d96fad884f272c9647eb9
parentdb9aee6ccf183508835acc325f5ad87d595eacc4
Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/omadec.c