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

« back to all changes in this revision

Viewing changes to modules/misc/stats/stats.c

  • 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:
62
62
        set_capability( "demux", 0 )
63
63
        add_shortcut( "stats" )
64
64
        set_callbacks( OpenDemux, CloseDemux )
65
 
    add_submodule ()
66
 
        set_section( N_( "Stats video output" ), NULL )
67
 
        set_description( N_("Stats video output function") )
68
 
        set_capability( "video output", 0 )
69
 
        add_shortcut( "stats" )
70
 
        set_callbacks( OpenVideo, NULL )
71
65
vlc_module_end ()
72
66