* commit '2681924b':
  libavformat: Fix standalone compilation of the webm muxer

Conflicts:
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>