Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 12:21:25 +0000 (14:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 12:23:01 +0000 (14:23 +0200)
commit7dba57d1fa6b21e88f9539e1e02a07dd07899cda
treec2c513d938a1e5687a09155ca832d79c6df169d7
parent61c6e69709ca202bfd1df6b0c651c79a9b8e7622
parent0db6bbb24c1a9f6b5527f460361a5a4132248eee
Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'

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

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