Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 09:31:16 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 09:31:25 +0000 (11:31 +0200)
commit43229d609a1796cce3537932539439529b134b9b
treed04fcbc38baeb6e1e19b38fb82abc744aa9eff20
parent16fd75ceec1d3915b565469d796ac4a273813bfe
parent7388c0c58601477db076e2e74e8b11f8a644384a
Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'

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

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