Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Oct 2014 19:23:41 +0000 (21:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Oct 2014 19:25:37 +0000 (21:25 +0200)
commit36552345d04258e8496913684a06d293c00047ce
treeb4e44a1e113432eb2492849d84912e3715f52957
parent54112629f196473d6f6423accf5c7291972da0de
parentd7f530b0d67fe3996dbfa990a47c865e0d1400a2
Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'

* commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2':
  aviobuf: check context before using it

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