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)
* commit 'dd3754a48854cd570d38db72394491aab0f36570':
  indeo: use proper error code

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

Simple merge