[FFmpeg-cvslog] Merge commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 13:44:08 2013 +0200| [395538e0735e81a2efc14573e83e323c779f4b66] | committer: Michael Niedermayer

Merge commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54' into release/1.1

* commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54':
  indeo3: switch parsing the header to bytestream2
  indeo3: check motion vectors.
  rv10: check that extradata is large enough
  indeo3: fix data size check

Conflicts:
	libavcodec/indeo3.c

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

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