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)
commit8878aef04882f1bb6db9f56a2b228865e1c2bb75
tree468edd2d79b78c56fda6a5119009ba56e7ce699d
parent7ed002d79136c2e24d12b432852a271b235fc3b9
parentdaf1e0d3de03bd424016e2a7520e4e94ece5c0ac
Merge commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac'

* commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac':
  avio: Add an internal function for reading without copying

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