[FFmpeg-cvslog] Merge commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 17:33:44 2013 +0100| [a5115752cad0fdda77ce07ecb0cbc05988a7f7c7] | committer: Michael Niedermayer

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 at gmx.at>

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