Merge commit '5748faf291fec297ef25d81962b52b3438f54278'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 00:05:50 +0000 (02:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 00:06:47 +0000 (02:06 +0200)
* commit '5748faf291fec297ef25d81962b52b3438f54278':
  bytestream: add bytestream2_copy_buffer() functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/bytestream.h

Simple merge