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

Conflicts:
	libavcodec/bmvvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>