Merge commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 16:33:44 +0000 (17:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 16:33:44 +0000 (17:33 +0100)
commita5115752cad0fdda77ce07ecb0cbc05988a7f7c7
treed85214c5887f570874fa229835584896539f7960
parentcb297f6ae79bf9e31e9981122c4161effdd9b8a1
parentcd9b0bb07a66d3299bd62922e9dfa742219abe79
Merge commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79' into release/0.10

* commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79':
  4xm: validate the buffer size before parsing it
  indeo: Do not reference mismatched tiles
  indeo: Sanitize ff_ivi_init_planes fail paths

Conflicts:
libavcodec/4xm.c

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