[FFmpeg-cvslog] Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 14:10:06 2013 +0200| [27e8298c037587d88a3bda1c97caf2351e2e3243] | committer: Michael Niedermayer

Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'

* commit '94aefb1932be882fd93f66cf790ceb19ff575c19':
  4xm: do not overread the source buffer in decode_p_block

Conflicts:
	libavcodec/4xm.c

The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere

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

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