Michael Niedermayer 103ffde5a3 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@gmx.at>

2013-05-30 10:36:52 +02:00

21 KiB

Raw Blame History

View Raw