[FFmpeg-cvslog] Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  7 10:12:46 2013 +0200| [a18bf95a8ec4cc2459aa3860e99f2945d7976835] | committer: Michael Niedermayer

Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'

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

Conflicts:
	libavformat/Makefile

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

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