Merge commit '676da248cad49debc40720baa13214f0b94dcc71'

Merge commit '676da248cad49debc40720baa13214f0b94dcc71' * commit '676da248cad49debc40720baa13214f0b94dcc71': vmd: refactor the inner decode loop Conflicts: libavcodec/vmdav.c Merged-by: Michael Niedermayer 

• [DH] libavcodec/vmdav.c