Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 14:50:34 +0000 (16:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 14:50:34 +0000 (16:50 +0200)
commit4029a5ebc2f959d86a83edff6f72935c783f579e
treecb9a5a19026c269a670e9253d8c5ae62c31831e6
parente5dc5095f9fad406eb8c925892fbd655c68adffc
parent66531d634e75b834e89e4a6a0f7470ca018712a1
Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'

* commit '66531d634e75b834e89e4a6a0f7470ca018712a1':
  indeo3: switch parsing the header to bytestream2

Conflicts:
libavcodec/indeo3.c

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