Merge commit '676da248cad49debc40720baa13214f0b94dcc71'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 07:44:57 +0000 (09:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 07:44:57 +0000 (09:44 +0200)
commitab78e21ea285309b3d0a997a06cf993ff45b9fdc
treee96f9364808ac38d559263ec50259420c245fc80
parent8ef89833d0a4829cbf471511d191a987f6933bba
parent676da248cad49debc40720baa13214f0b94dcc71
Merge commit '676da248cad49debc40720baa13214f0b94dcc71'

* commit '676da248cad49debc40720baa13214f0b94dcc71':
  vmd: refactor the inner decode loop

Conflicts:
libavcodec/vmdav.c

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