diff options
| author | Automerge script <automerge@asterisk.org> | 2012-12-05 03:19:08 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2012-12-05 03:19:08 +0000 |
| commit | 521f9e8dfee50c2d81aa27839c7fce4e5ecda5a0 (patch) | |
| tree | 040e3ef9e458d2da716a9ecb12958291313ef0f3 /main/asterisk.c | |
| parent | 02e9f9fdd7b0d819e393572e1a9810df88875e06 (diff) | |
Merged revisions 377245-377246 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r377245 | rmudgett | 2012-12-04 20:20:57 -0600 (Tue, 04 Dec 2012) | 8 lines
Fix registering core show codecs/codec CLI commands twice.
........
Merged revisions 377241 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377244 from http://svn.asterisk.org/svn/asterisk/branches/11
................
r377246 | rmudgett | 2012-12-04 20:23:10 -0600 (Tue, 04 Dec 2012) | 1 line
Remove init_framer(). It no longer does anything.
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index aa12836c2..27145296a 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -4251,11 +4251,6 @@ int main(int argc, char *argv[]) exit(1); } - if (init_framer()) { - printf("%s", term_quit()); - exit(1); - } - if (ast_enum_init()) { printf("%s", term_quit()); exit(1); |