← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/access/dshow/crossbar.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/access/dshow/crossbar.cpp
2
2
 * crossbar.c : DirectShow access module for vlc
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2002 the VideoLAN team
5
 
 * $Id: c34b2902859926db148d870f363c4ff6a6771c30 $
 
5
 * $Id: 653227ea6479610095cf2e5a3225e1f26f8667ec $
6
6
 *
7
7
 * Author: Damien Fouilleul <damien dot fouilleul at laposte dot net>
8
8
 *
30
30
#endif
31
31
 
32
32
#include <vlc_common.h>
33
 
#include <vlc_vout.h>
34
33
 
35
34
#ifndef _MSC_VER
36
35
    /* Work-around a bug in w32api-2.5 */