Merge commit 'c5eb279e240af6b7228a624cd7193732f2d5adaa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 08:50:59 +0000 (09:50 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 08:50:59 +0000 (09:50 +0100)
* commit 'c5eb279e240af6b7228a624cd7193732f2d5adaa':
  g723: Add missing header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/g723_1.h

Simple merge