Merge commit '4f6fbe47a9f784373c277870d9d4989762873bf1' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 23:32:19 +0000 (01:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 23:32:19 +0000 (01:32 +0200)
commit2a3954818121c80599d62f8db4774bb07954f5bf
tree0fad2c1c19597a6b37184fa844ea7e6a2e1065fd
parent4c052a7b8b0a6cab3593e8d0bb795588bae2cc9e
parent4f6fbe47a9f784373c277870d9d4989762873bf1
Merge commit '4f6fbe47a9f784373c277870d9d4989762873bf1' into release/1.1

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

Conflicts:
libavcodec/vmdav.c

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