1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
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
..
2013-05-10 16:53:50 -03:00
2013-05-10 16:10:51 -03:00
2013-05-22 21:30:28 +02:00
2013-05-29 12:37:33 +00:00
2013-05-23 12:03:06 +00:00
2013-05-13 14:39:32 +02:00
2013-04-25 20:06:13 +00:00
2013-04-25 14:21:00 +00:00
2013-05-04 14:42:19 +02:00
2013-05-15 12:15:21 +02:00
2013-05-07 20:33:46 +02:00
2013-05-28 13:35:09 +02:00
2013-05-04 02:50:30 +02:00
2013-05-11 21:23:46 +02:00
2013-05-19 13:56:13 +02:00
2013-05-16 14:05:46 +02:00
2013-05-23 10:05:28 +00:00
2013-04-30 13:35:14 +02:00
2013-05-29 19:57:03 +02:00
2013-05-26 21:57:28 +00:00
2013-05-28 12:49:20 +02:00
2013-05-10 01:40:24 +02:00
2013-05-22 20:24:50 +02:00
2013-05-22 20:24:50 +02:00
2013-05-23 20:38:53 +00:00
2013-05-07 21:59:05 +02:00
2013-05-22 17:40:12 +02:00
2013-05-29 12:30:07 +00:00
2013-05-21 12:56:11 +02:00
2013-05-28 13:56:29 +03:00
2013-05-05 15:12:59 +02:00
2013-04-25 20:17:05 +00:00
2013-05-21 17:49:29 +00:00
2013-05-29 22:31:16 +02:00