Merge commit 'a5864e9a253143437471dba61a533e7fa9acec1c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 23:01:26 +0000 (01:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 23:02:40 +0000 (01:02 +0200)
commitad081e4def36cba8070b1cc883f168df194c3bed
tree3acabb0f5ea951c3003f0940152c00bcd646221f
parent8469c73576f76a3390cd93455cc4b2fea1d29154
parenta5864e9a253143437471dba61a533e7fa9acec1c
Merge commit 'a5864e9a253143437471dba61a533e7fa9acec1c'

* commit 'a5864e9a253143437471dba61a533e7fa9acec1c':
  output example: free the muxing format context properly

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