Merge commit '3627ce2f1dab1d33b7f99d78907a3e4d86b7d847'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 10:25:58 +0000 (12:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 10:26:09 +0000 (12:26 +0200)
* commit '3627ce2f1dab1d33b7f99d78907a3e4d86b7d847':
  aviobuf: Add functions for null buffers

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

Simple merge
Simple merge