← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid-security

« back to all changes in this revision

Viewing changes to modules/access/http.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2009-09-25 14:44:17 UTC
  • mfrom: (3.5.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090925144417-87vomt575d0agvqa
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/access/http.c
2
2
 * http.c: HTTP input module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2001-2008 the VideoLAN team
5
 
 * $Id: 258431a3f7d9f618bdcb20ba6122a21ddb5b4f72 $
 
5
 * $Id: 94f36a5d778eabd0b6db8304bc18586dda98f88a $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Christophe Massiot <massiot@via.ecp.fr>
111
111
        change_safe()
112
112
    add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT,
113
113
                AGENT_LONGTEXT, true )
 
114
        change_safe()
114
115
    add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT,
115
116
              RECONNECT_LONGTEXT, true )
116
117
    add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT,