~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavcodec/msmpeg4.h

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
49
49
                            int n, int coded, const uint8_t *scan_table);
50
50
int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
51
51
 
52
 
#define ENABLE_MSMPEG4_DECODER (ENABLE_MSMPEG4V1_DECODER || \
53
 
                                ENABLE_MSMPEG4V2_DECODER || \
54
 
                                ENABLE_MSMPEG4V3_DECODER || \
55
 
                                ENABLE_WMV2_DECODER)
56
 
#define ENABLE_MSMPEG4_ENCODER (ENABLE_MSMPEG4V1_ENCODER || \
57
 
                                ENABLE_MSMPEG4V2_ENCODER || \
58
 
                                ENABLE_MSMPEG4V3_ENCODER || \
59
 
                                ENABLE_WMV2_ENCODER)
60
 
#define ENABLE_MSMPEG4 (ENABLE_MSMPEG4_DECODER || ENABLE_MSMPEG4_ENCODER)
61
 
#define ENABLE_WMV2 (ENABLE_WMV2_DECODER || ENABLE_WMV2_ENCODER)
62
 
#define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER)
63
 
#define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER)
 
52
#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
 
53
                                CONFIG_MSMPEG4V2_DECODER || \
 
54
                                CONFIG_MSMPEG4V3_DECODER || \
 
55
                                CONFIG_WMV2_DECODER      || \
 
56
                                CONFIG_VC1_DECODER       || \
 
57
                                CONFIG_WMV3_DECODER)
 
58
#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \
 
59
                                CONFIG_MSMPEG4V2_ENCODER || \
 
60
                                CONFIG_MSMPEG4V3_ENCODER || \
 
61
                                CONFIG_WMV2_ENCODER)
 
62
#define CONFIG_MSMPEG4 (CONFIG_MSMPEG4_DECODER || CONFIG_MSMPEG4_ENCODER)
 
63
#define CONFIG_WMV2 (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER)
 
64
#define CONFIG_WMV_DECODER (CONFIG_WMV1_DECODER || CONFIG_WMV2_DECODER)
 
65
#define CONFIG_WMV_ENCODER (CONFIG_WMV1_ENCODER || CONFIG_WMV2_ENCODER)
64
66
 
65
67
#endif /* AVCODEC_MSMPEG4_H */