[FFmpeg-cvslog] Merge commit 'c5eb279e240af6b7228a624cd7193732f2d5adaa'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Dec  8 09:50:59 2015 +0100| [3f9c64831cac63f5b216bca339c8d13169118091] | committer: Hendrik Leppkes

Merge commit 'c5eb279e240af6b7228a624cd7193732f2d5adaa'

* commit 'c5eb279e240af6b7228a624cd7193732f2d5adaa':
  g723: Add missing header

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f9c64831cac63f5b216bca339c8d13169118091
---