Merge commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:02:23 +0000 (15:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:02:27 +0000 (15:02 +0200)
* commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac':
  avio: Add an internal function for reading without copying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/avio_internal.h
libavformat/aviobuf.c

Simple merge
Simple merge