[FFmpeg-cvslog] Merge commit '676da248cad49debc40720baa13214f0b94dcc71'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 30 09:44:57 2013 +0200| [ab78e21ea285309b3d0a997a06cf993ff45b9fdc] | committer: Michael Niedermayer

Merge commit '676da248cad49debc40720baa13214f0b94dcc71'

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

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab78e21ea285309b3d0a997a06cf993ff45b9fdc
---