Merge commit 'f023d57d355ff3b917f1aad9b03db5c293ec4244'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 14:50:45 +0000 (15:50 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Dec 2015 14:50:45 +0000 (15:50 +0100)
commit90c93fb12948f0b00720df91961a09e187703060
tree6da306f52459e1178c7d75c058b0389b49db6d89
parent6c9cc21bcca952ca86a6cf08376afa9f3b7a2034
parentf023d57d355ff3b917f1aad9b03db5c293ec4244
Merge commit 'f023d57d355ff3b917f1aad9b03db5c293ec4244'

* commit 'f023d57d355ff3b917f1aad9b03db5c293ec4244':
  lavc: G.723.1 encoder

Split existing FFmpeg G.723.1 encoder into a new file.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/general.texi
libavcodec/Makefile
libavcodec/celp_math.h
libavcodec/g723_1.c
libavcodec/g723_1.h
libavcodec/g723_1dec.c
libavcodec/g723_1enc.c