Merge commit 'ca5f386e75c592ce25b8184516fd0d580ccb31bb'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 14:55:13 +0000 (15:55 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 14:55:13 +0000 (15:55 +0100)
* commit 'ca5f386e75c592ce25b8184516fd0d580ccb31bb':
  lavf: G.723.1 muxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge