[FFmpeg-cvslog] Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 17 16:50:34 2013 +0200| [4029a5ebc2f959d86a83edff6f72935c783f579e] | committer: Michael Niedermayer

Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'

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

Conflicts:
	libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4029a5ebc2f959d86a83edff6f72935c783f579e
---