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)
* commit 'a5864e9a253143437471dba61a533e7fa9acec1c':
  output example: free the muxing format context properly

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

Trivial merge