← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/vlc_vod.h

  • 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:
include/vlc_vod.h
2
2
 * vlc_vod.h: interface for VoD server modules
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2000, 2001 the VideoLAN team
5
 
 * $Id: 17cd2e497af218a5ab2f935f2f923966905be1dd $
 
5
 * $Id: 9b136108f2b844a971087a407f249ed3f5c5cf9b $
6
6
 *
7
7
 * Author: Gildas Bazin <gbazin@videolan.org>
8
8
 *
30
30
 */
31
31
 
32
32
/**
33
 
 * \defgroup server Video On Demand (VOD)
 
33
 * \defgroup vod Video On Demand (VOD)
 
34
 * \ingroup server
34
35
 * Video On Demand (VOD) functionality is provided from VLM.
35
36
 * @{
36
37
 */
78
79
    VOD_MEDIA_FORWARD,      /* arg1= double         res=    */
79
80
};
80
81
 
81
 
/**}*/
 
82
/**
 
83
 * @}
 
84
 */
82
85
 
83
86
#endif