[FFmpeg-cvslog] Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 12:21:25 2013 +0200| [c3660c361822ffa9ae4fc47f655adab52a0f3c57] | committer: Michael Niedermayer

Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423'

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

Conflicts:
	libavcodec/vmdav.c

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

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