[FFmpeg-cvslog] Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 00:31:22 2014 +0200| [9e8c92226fe18a21b6605550a50b67066a6bffd9] | committer: Michael Niedermayer

Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'

* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd':
  build: Add missing object files for webm muxer

Conflicts:
	libavformat/Makefile

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

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