Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 11:18:07 +0000 (13:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 11:18:29 +0000 (13:18 +0200)
commite3b13c108160869a2dddd1d5bfd42b0b9c917d43
treea62dbe6cd78f825177e9cbef14fd7b71dfe26bb4
parent1cd74a9b4d6ee89ce7a7b9118de0a83dee14b1e2
parentb0eeb9d442e4b7e82f6797d74245434ea33110a5
Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'

* commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5':
  indeo5: return proper error codes

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