[FFmpeg-cvslog] Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  7 18:01:16 2014 +0200| [06dae71d477ce0f48d9a8451c710ef13d62abf6c] | committer: Michael Niedermayer

Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'

* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
	libavcodec/vmdvideo.c

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

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