Merge commit 'dd3754a48854cd570d38db72394491aab0f36570'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 09:37:13 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 09:37:37 +0000 (11:37 +0200)
commit280afa40bcf52f3ce419c3ec3c33d13f0f40e48a
tree2af3b63997236faa6b413c2bb039f261393c5e54
parent43229d609a1796cce3537932539439529b134b9b
parentdd3754a48854cd570d38db72394491aab0f36570
Merge commit 'dd3754a48854cd570d38db72394491aab0f36570'

* commit 'dd3754a48854cd570d38db72394491aab0f36570':
  indeo: use proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ivi_common.c