Skip to content
Snippets Groups Projects
Commit b44f72f7 authored by Automerge script's avatar Automerge script
Browse files

Merged revisions 377018,377022 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r377018 | oej | 2012-12-03 08:46:02 -0600 (Mon, 03 Dec 2012) | 5 lines
  
  Move functions to AFTER the block of forward declarations of functions. 
  
  It was a mess. The first part of chan_sip.c is constants, declarations, structures and stuff,
  then forward declarations and then actual code. It's still a mess, but a bit less messy ;-)
................
  r377022 | file | 2012-12-03 08:56:36 -0600 (Mon, 03 Dec 2012) | 13 lines
  
  Fix an RTP instance reference count leak in chan_motif.
  
  When setting up an RTP instance the RTCP portion of the instance
  keeps a reference to the instance itself. In order to release this
  reference and stop RTCP the stop API call must be called before
  destroying the instance.
  
  (closes issue ASTERISK-20751)
  Reported by: joshoa
  ........
  
  Merged revisions 377021 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377028 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 129b1fba
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment