← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/gui/skins2/src/os_factory.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/skins2/src/os_factory.cpp
2
2
 * os_factory.cpp
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003 the VideoLAN team
5
 
 * $Id: c954633164e5c2dc9759dd4cf6e650879f030a41 $
 
5
 * $Id: 297485c2b0fa9514f5ce58cc9675c630a5f00b42 $
6
6
 *
7
7
 * Authors: Cyril Deguet     <asmax@via.ecp.fr>
8
8
 *          Olivier Teulière <ipkiss@via.ecp.fr>
64
64
 
65
65
void OSFactory::destroy( intf_thread_t *pIntf )
66
66
{
67
 
    if( pIntf->p_sys->p_osFactory )
68
 
    {
69
 
        delete pIntf->p_sys->p_osFactory;
70
 
        pIntf->p_sys->p_osFactory = NULL;
71
 
    }
 
67
    delete pIntf->p_sys->p_osFactory;
 
68
    pIntf->p_sys->p_osFactory = NULL;
72
69
}
73
70