[FFmpeg-cvslog] Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 17 14:21:25 2014 +0200| [7dba57d1fa6b21e88f9539e1e02a07dd07899cda] | committer: Michael Niedermayer

Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'

* commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee':
  avformat: Make avformat_free_context handle NULL

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

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