← Back to branch summary

~ubuntu-branches/ubuntu/karmic/avidemux/karmic

« back to all changes in this revision

Viewing changes to avidemux/ADM_libraries/ADM_lavcodec/ffconf.h

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-02-17 23:41:46 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090217234146-eakx254awuch4wgw
Tags: 1:2.4.4-0.0ubuntu1
* Merge from debian multimedia, Ubuntu remaining changes:
  - debian/control:
    + Build-Depends on newer libx264-dev.
    + Don't Build-Depends on ccache and libamrnb-dev.
    + Build-Depends on libpulse-dev.
    + Fixed small typo in avidemux description.
  - Don't use ccache.
  - Drop patch to fix build with newer x264, it has been merged by upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_libraries/ADM_lavcodec/ffconf.h
45
45
#define ENABLE_SNOW_DECODER 1
46
46
#define ENABLE_AMV_DECODER 1
47
47
#define ENABLE_RAWVIDEO_DECODER 1
 
48
#define ENABLE_BMP_DECODER 1
48
49
#define ENABLE_AASC_DECODER 0
49
50
#define ENABLE_AVS_DECODER 0
50
51
#define ENABLE_BETHSOFTVID_DECODER 0
116
117
#define ENABLE_ADPCM_THP_DECODER 0
117
118
#define ENABLE_ASV1_DECODER 0
118
119
#define ENABLE_ASV2_DECODER 0
119
 
#define ENABLE_BMP_DECODER 0
120
120
#define ENABLE_FLASHSV_DECODER 0
121
121
#define ENABLE_GIF_DECODER 0
122
122
#define ENABLE_H261_DECODER 0
123
123
#define ENABLE_H263I_DECODER 0
124
124
#define ENABLE_JPEGLS_DECODER 0
125
 
#define ENABLE_PNG_DECODER 0
126
125
#define ENABLE_QTRLE_DECODER 0
127
126
#define ENABLE_ROQ_DECODER 0
128
127
#define ENABLE_SGI_DECODER 0
319
318
#define ENABLE_BFIN      0
320
319
#define ENABLE_SMALL      0
321
320
#define CONFIG_SNOW_ENCODER      1
 
321
#define ENABLE_PNG_DECODER      1
 
322
#define CONFIG_PNG_DECODER      1