Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 07:18:16 +0000 (09:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Oct 2013 07:19:05 +0000 (09:19 +0200)
commitf18db82f291ced9ae07765a12afc8a47c89ee2b7
tree2872b8a59710e658292382697ea142209fdbf001
parent7824b5f6f5b6200f362017960de413748d917a06
parent61cd19b8bc32185c8caf64d89d1b0909877a0707
Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'

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

Conflicts:
libavcodec/vmnc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vmnc.c