[FFmpeg-cvslog] Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:02:25 2015 +0100| [153a012384b3ed05c1e04874c63c7f0078ee99e7] | committer: Michael Niedermayer

Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4

* commit '6cf27b550d66963b89b5917568b85c4b49fb18ba':
  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=153a012384b3ed05c1e04874c63c7f0078ee99e7
---