← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavdevice/alldevices.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/alldevices.c
29
29
 
30
30
#define REGISTER_MUXER(X,x) { \
31
31
          extern AVOutputFormat x##_muxer; \
32
 
          if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer); }
 
32
          if(CONFIG_##X##_MUXER)   av_register_output_format(&x##_muxer); }
33
33
#define REGISTER_DEMUXER(X,x) { \
34
34
          extern AVInputFormat x##_demuxer; \
35
 
          if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
 
35
          if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
36
36
#define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
37
37
 
38
38
void avdevice_register_all(void)