Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:21:25 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:21:25 +0000 (12:21 +0200)
commitc3660c361822ffa9ae4fc47f655adab52a0f3c57
tree5a872b20159f0885fce7ec3673f33da9725653cd
parent45a73d2b472ffcc0d87f3efae3424c44976d6935
parent0aed0bfc62b273a780a2bfba3be56039fccd7423
Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'

* commit '0aed0bfc62b273a780a2bfba3be56039fccd7423':
  vmd: fix mode 3 decoding

Conflicts:
libavcodec/vmdav.c

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