Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:28:14 +0000 (19:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:28:39 +0000 (19:28 +0100)
* commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4':
  aviobuf: Handle a NULL buffer in avio_close_dyn_buf

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

Simple merge