[FFmpeg-cvslog] Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 20 21:23:41 2014 +0200| [36552345d04258e8496913684a06d293c00047ce] | committer: Michael Niedermayer

Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'

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

See: 7441d1ec330da810a0ffd44a02b2fc60add5b719
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36552345d04258e8496913684a06d293c00047ce
---