Merge commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:44:08 +0000 (13:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:44:08 +0000 (13:44 +0200)
commit395538e0735e81a2efc14573e83e323c779f4b66
treefac09aeb9abce64be10fe616f1f896d5f14cbf10
parenta367ab657f29869d46ca57ce58251b02343a2b53
parent95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54
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@gmx.at>
libavcodec/indeo3.c
libavcodec/rv10.c