Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:02:08 +0000 (16:02 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 15:02:16 +0000 (16:02 +0100)
commit95348174ef87b67f14609334ef177fe9e75c48c1
treebd0567a2e2e74654c7c5f842cf0b3ff8ae2d9190
parent6614214ece70f1d41d085d822ed02941601d6868
parentc80344d0101558098a6cd2ed5082ff5fda7ca18b
Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'

* commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b':
  mpegvideo_enc: use avcodec_free_context() instead of av_free()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/mpegvideo_enc.c