[FFmpeg-cvslog] Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 10 09:18:16 2013 +0200| [f18db82f291ced9ae07765a12afc8a47c89ee2b7] | committer: Michael Niedermayer

Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'

* commit '61cd19b8bc32185c8caf64d89d1b0909877a0707':
  vmnc: Port to bytestream2

Conflicts:
	libavcodec/vmnc.c

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

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