[FFmpeg-cvslog] Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  6 23:43:37 2014 +0200| [96761e9306a9f96abaaa6bf53fe48c4d6872f48e] | committer: Michael Niedermayer

Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'

* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
	libavcodec/bmvvideo.c

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

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