David Vossel 8b76932284 Merged revisions 228441 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

........
  r228441 | dvossel | 2009-11-06 11:22:31 -0600 (Fri, 06 Nov 2009) | 3 lines
  
  Fixes merging issue from 1.4, frame data is held in data.ptr in trunk
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@228447 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-11-06 17:24:08 +00:00

..

g722

Merged revisions 194722 via svnmerge from

2009-05-15 18:05:35 +00:00

gsm

Merged revisions 207680 via svnmerge from

2009-07-21 13:56:35 +00:00

ilbc

Merged revisions 110880 via svnmerge from

2008-03-26 17:10:28 +00:00

lpc10

Merged revisions 209554 via svnmerge from

2009-07-30 18:51:15 +00:00

codec_a_mu.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_adpcm.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_alaw.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_dahdi.c

Merged revisions 206636 via svnmerge from

2009-07-15 16:04:42 +00:00

codec_g722.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_g726.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_gsm.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_ilbc.c

Merged revisions 228441 via svnmerge from

2009-11-06 17:24:08 +00:00

codec_lpc10.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_resample.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

codec_speex.c

AST-2009-005

2009-08-10 19:36:38 +00:00

codec_ulaw.c

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_adpcm.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_alaw.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_g722.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_g726.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_gsm.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_ilbc.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_lpc10.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_speex.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

ex_ulaw.h

Merge codec_consistency branch. This should make sample usage much happier.

2008-10-17 21:35:23 +00:00

log2comp.h

Merged revisions 109648 via svnmerge from

2008-03-18 19:24:15 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:56:35 +00:00