diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 01:56:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 01:57:01 +0200 |
| commit | d6373f15869720ac6de93eba61b0a4a7a450d4c9 (patch) | |
| tree | ee8f3cd97baa9ea7aabdc23a2db73cccda0ff483 /libavcodec/dcadec.c | |
| parent | 2a3954818121c80599d62f8db4774bb07954f5bf (diff) | |
| parent | dbaf3f7b0bc9e99dff8e06bd29fcb3e84eebfe7c (diff) | |
| download | ffmpeg-d6373f15869720ac6de93eba61b0a4a7a450d4c9.tar.gz | |
Merge commit 'dbaf3f7b0bc9e99dff8e06bd29fcb3e84eebfe7c' into release/1.1
* commit 'dbaf3f7b0bc9e99dff8e06bd29fcb3e84eebfe7c':
vmd: drop incomplete chunks and spurious samples
vmd: return meaningful errors
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
0 files changed, 0 insertions, 0 deletions