Merge commit 'd946e4c1bcfb6accd97f6d4cbfa324ef01913c8d' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:56:56 +0000 (16:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:57:01 +0000 (16:57 +0200)
* commit 'd946e4c1bcfb6accd97f6d4cbfa324ef01913c8d':
  bytestream: add bytestream2_copy_buffer() functions

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

Simple merge