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)
commit3f9c64831cac63f5b216bca339c8d13169118091
tree8df0cb4a80b8c044607b674972e27e07b4c95e01
parent8076711d4cf9f66b74ac8af37f36c7fc7582b102
parentc5eb279e240af6b7228a624cd7193732f2d5adaa
Merge commit 'c5eb279e240af6b7228a624cd7193732f2d5adaa'

* commit 'c5eb279e240af6b7228a624cd7193732f2d5adaa':
  g723: Add missing header

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