← Back to branch summary

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

« back to all changes in this revision

Viewing changes to main/frame.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:
main/frame.c
25
25
 
26
26
#include "asterisk.h"
27
27
 
28
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 215165 $")
 
28
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 222883 $")
29
29
 
30
30
#include "asterisk/_private.h"
31
31
#include "asterisk/lock.h"
336
336
                ast_translate_frame_freed(fr);
337
337
        } else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) {
338
338
                ast_dsp_frame_freed(fr);
339
 
        } else if (ast_test_flag(fr, AST_FRFLAG_FROM_FILESTREAM)) {
340
 
                ast_filestream_frame_freed(fr);
341
339
        }
342
340
 
343
341
        if (!fr->mallocd)
426
424
        } else {
427
425
                ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
428
426
                ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
429
 
                ast_clear_flag(fr, AST_FRFLAG_FROM_FILESTREAM);
430
427
                out = fr;
431
428
        }
432
429