Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 07:37:14 +0000 (09:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 07:37:14 +0000 (09:37 +0200)
commit8ef89833d0a4829cbf471511d191a987f6933bba
tree6a5d90901ff57df43bf983d17f2abb850517ec49
parent6635b13411a8a9399e57c73b79a16c60d6505a03
parentc8f3cb9119c2183680d44a509a1b5a9817a3bee9
Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'

* commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9':
  vmd: return meaningful errors

Conflicts:
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vmdav.c