← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-updates

« back to all changes in this revision

Viewing changes to libavdevice/audio.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 17:51:19 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120175119-gu6kw1arv5tmf1vr
Tags: 3:0.svn20090119-1ubuntu1+unstripped1
https://launchpad.net/bugs/303537
* merge with the ubuntu.jaunty branch
* reenable x264 LP: #303537
* build against vdpau
* enable xvmc support

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavdevice/audio.c
25
25
#include <stdint.h>
26
26
#include <string.h>
27
27
#include <errno.h>
28
 
#ifdef HAVE_SOUNDCARD_H
 
28
#if HAVE_SOUNDCARD_H
29
29
#include <soundcard.h>
30
30
#else
31
31
#include <sys/soundcard.h>
311
311
    return 0;
312
312
}
313
313
 
314
 
#ifdef CONFIG_OSS_DEMUXER
 
314
#if CONFIG_OSS_DEMUXER
315
315
AVInputFormat oss_demuxer = {
316
316
    "oss",
317
317
    NULL_IF_CONFIG_SMALL("Open Sound System capture"),
324
324
};
325
325
#endif
326
326
 
327
 
#ifdef CONFIG_OSS_MUXER
 
327
#if CONFIG_OSS_MUXER
328
328
AVOutputFormat oss_muxer = {
329
329
    "oss",
330
330
    NULL_IF_CONFIG_SMALL("Open Sound System playback"),