[FFmpeg-cvslog] Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 11:56:31 2013 +0200| [4027e136635759999ffb5fa16d1053f26c1dec5e] | committer: Michael Niedermayer

Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'

* commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11':
  4xm: do not overread while parsing header

Conflicts:
	libavformat/4xm.c

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

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