Commit d1256272 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'ca5f386e'

* commit 'ca5f386e':
  lavf: G.723.1 muxer
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 90c93fb1 ca5f386e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment