[FFmpeg-cvslog] Merge commit 'dbaf3f7b0bc9e99dff8e06bd29fcb3e84eebfe7c' into release/1.1
Michael Niedermayer
git at videolan.org
Mon Jun 3 02:01:28 CEST 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 3 01:56:10 2013 +0200| [d6373f15869720ac6de93eba61b0a4a7a450d4c9] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6373f15869720ac6de93eba61b0a4a7a450d4c9
---
More information about the ffmpeg-cvslog
mailing list