Merge commit 'dbaf3f7b0bc9e99dff8e06bd29fcb3e84eebfe7c' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 23:56:10 +0000 (01:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 23:57:01 +0000 (01:57 +0200)
commitd6373f15869720ac6de93eba61b0a4a7a450d4c9
treeee8f3cd97baa9ea7aabdc23a2db73cccda0ff483
parent2a3954818121c80599d62f8db4774bb07954f5bf
parentdbaf3f7b0bc9e99dff8e06bd29fcb3e84eebfe7c
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>
libavcodec/vmdav.c