← Back to branch summary

~ubuntu-branches/ubuntu/quantal/asterisk/quantal

« back to all changes in this revision

Viewing changes to formats/format_g729.c

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault
  • Date: 2010-02-16 14:08:54 UTC
  • mfrom: (1.2.5 upstream) (8.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100216140854-rb2godspb9lduazl
Tags: 1:1.6.2.2-1ubuntu1
* Merge from Debian: security update
  * Changes:
  - debian/control: Change Maintainer
  - debian/control: Removed Uploaders field.
  - debian/control: Removed Debian Vcs-Svn entry and replaced with
      ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
  - debian/asterisk.init : chown /dev/dahdi
  - debian/backports/hardy : add file
  - debian/backports/asterisk.init.hardy : add file

Show diffs side-by-side

added added

removed removed

Lines of Context:
formats/format_g729.c
28
28
 
29
29
#include "asterisk.h"
30
30
 
31
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 117802 $")
 
31
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 233694 $")
32
32
 
33
33
#include "asterisk/mod_format.h"
34
34
#include "asterisk/module.h"
145
145
        return ast_format_unregister(g729_f.name);
146
146
}       
147
147
 
148
 
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G729 data");
 
148
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Raw G729 data",
 
149
        .load = load_module,
 
150
        .unload = unload_module,
 
151
        .load_pri = 10,
 
152
);