I thought I was going to be able to leave 1.4 alone, but that was not the case.
commitf575dc12821eb33c950cd996bb9a8609d11a3218
authorrussell <russell@614ede4d-c843-0410-af14-a771ab80d22e>
Tue, 22 Apr 2008 21:14:55 +0000 (22 21:14 +0000)
committerrussell <russell@614ede4d-c843-0410-af14-a771ab80d22e>
Tue, 22 Apr 2008 21:14:55 +0000 (22 21:14 +0000)
tree9b131feb9104cf0ca54f6bbc52640ee0f0c1798e
parent454223783d81aea2f92dbec9fa73dab81ec80ea2
I thought I was going to be able to leave 1.4 alone, but that was not the case.
I ran into some problems with G.722 in 1.4, so I have merged in all of the fixes
in this area that I have made in trunk/1.6.0, and things are happy again.

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@114550 614ede4d-c843-0410-af14-a771ab80d22e
formats/format_pcm.c
main/channel.c
main/file.c
main/rtp.c