[FFmpeg-cvslog] Merge commit '701966730ce10290fd49c5ccedd73f505680f764'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 30 10:23:50 2013 +0200| [103ffde5a3914c33a34a951a3f4086801dbe4938] | committer: Michael Niedermayer

Merge commit '701966730ce10290fd49c5ccedd73f505680f764'

* commit '701966730ce10290fd49c5ccedd73f505680f764':
  vmd: drop incomplete chunks and spurious samples

Conflicts:
	libavcodec/vmdav.c

2 of the changes are replaced by assert0s, as they should
be impossible.
The actual bug is likely caused by a invalid block_align
which is checked for and thus impossible in ffmpeg.

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

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