← Back to branch summary

~ubuntu-branches/ubuntu/karmic/vlc/karmic

« back to all changes in this revision

Viewing changes to modules/video_filter/atmo/AtmoOutputFilter.cpp

  • 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/video_filter/atmo/AtmoOutputFilter.cpp
6
6
 *
7
7
 * See the README.txt file for copyright information and how to reach the author(s).
8
8
 *
9
 
 * $Id$
 
9
 * $Id: 3cefa0033c5aee8bf19329c1fc064368c7f50c6c $
10
10
 */
11
11
 
12
12
#include <string.h>