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)
* commit '7388c0c58601477db076e2e74e8b11f8a644384a':
  indeo: Properly forward the error codes

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

Simple merge