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

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 17:51:21 2013 +0100| [1825d6d096102c2a220d61bad34009f583ca4a5e] | committer: Michael Niedermayer

Merge commit '12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca' into release/0.10

* commit '12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca':
  4xm: do not overread the prestream buffer

Conflicts:
	libavcodec/4xm.c

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

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