diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:23:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:36:52 +0200 |
| commit | 103ffde5a3914c33a34a951a3f4086801dbe4938 (patch) | |
| tree | ba8e42bdcb2044d80409f0964d7752119bb97966 /libavcodec/sipr.h | |
| parent | ab78e21ea285309b3d0a997a06cf993ff45b9fdc (diff) | |
| parent | 701966730ce10290fd49c5ccedd73f505680f764 (diff) | |
| download | ffmpeg-103ffde5a3914c33a34a951a3f4086801dbe4938.tar.gz | |
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>
Diffstat (limited to 'libavcodec/sipr.h')
0 files changed, 0 insertions, 0 deletions