Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 16:01:16 +0000 (18:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 16:06:39 +0000 (18:06 +0200)
commit06dae71d477ce0f48d9a8451c710ef13d62abf6c
tree2d35c975113d221ed3d6eb48a7717a04655fe82a
parent5320b34b9853e0c2ce51ee447abe42844e591cda
parent246f869590b8c7313d26e1c2ef56db01f6fd2503
Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'

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

Conflicts:
libavcodec/vmdvideo.c

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