[FFmpeg-cvslog] Merge commit '4f6fbe47a9f784373c277870d9d4989762873bf1' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 01:32:19 2013 +0200| [2a3954818121c80599d62f8db4774bb07954f5bf] | committer: Michael Niedermayer

Merge commit '4f6fbe47a9f784373c277870d9d4989762873bf1' into release/1.1

* commit '4f6fbe47a9f784373c277870d9d4989762873bf1':
  vmdav: convert to bytestream2

Conflicts:
	libavcodec/vmdav.c

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

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