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)
commit81c3bb78aca7db56020a61f66cab3b6719a7e1b3
tree8bad9349f07e912f1248021fc5a83253526033bf
parent382545ae62ca2cd5ae75b4e951e7ad659e3cc5fb
parentd07b51bf0733fe58bbfa13c448775dc325463cb4
Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'

* commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4':
  aviobuf: Handle a NULL buffer in avio_close_dyn_buf

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