← Back to branch summary

~ubuntu-branches/ubuntu/utopic/linphone/utopic-proposed

« back to all changes in this revision

Viewing changes to mediastreamer2/build/win32native/alldescs.h

  • Committer: Bazaar Package Importer
  • Author(s): Mark Purcell
  • Date: 2010-05-23 10:04:07 UTC
  • mfrom: (1.3.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100523100407-wev5qrmhwwbs0whh
Tags: 3.3.0-1
http://bugs.debian.org/582661
http://bugs.debian.org/582665
http://bugs.debian.org/561708
http://bugs.debian.org/542595
* New upstream release

* debian/control: s/is a is an/is an/ (Closes: #582661)
* debian/control s/It main/Its main/ (Closes: #582665) 
* configure --disable-strict (Closes: 561708)
* Cleanup arches libv4l-dev libasound2-dev (Closes: #542595)
* Cleanup debian/watch
* Drop fix_desktop_section.dpatch - included upstream
* Drop desktop-icon.dpatch - included upstream
* Drop always_ipv4_for_ipv4_hosts.dpatch - included upstream
* Drop dpatch
* Upstream dropped /usr/bin/sipomatic

Show diffs side-by-side

added added

removed removed

Lines of Context:
mediastreamer2/build/win32native/alldescs.h
29
29
extern MSFilterDesc ms_snow_dec_desc;
30
30
extern MSFilterDesc ms_theora_enc_desc;
31
31
extern MSFilterDesc ms_theora_dec_desc;
 
32
extern MSFilterDesc ms_mjpeg_enc_desc;
 
33
extern MSFilterDesc ms_mjpeg_dec_desc;
32
34
extern MSFilterDesc ms_size_conv_desc;
33
35
extern MSFilterDesc ms_pix_conv_desc;
34
36
extern MSFilterDesc ms_join_desc;
39
41
extern MSFilterDesc ms_vfw_desc;
40
42
extern MSFilterDesc ms_ice_desc;
41
43
extern MSFilterDesc ms_equalizer_desc;
 
44
extern MSFilterDesc ms_dd_display_desc;
42
45
MSFilterDesc * ms_filter_descs[]={
43
46
&ms_alaw_dec_desc,
44
47
&ms_alaw_enc_desc,
69
72
&ms_snow_dec_desc,
70
73
&ms_theora_enc_desc,
71
74
&ms_theora_dec_desc,
 
75
&ms_mjpeg_enc_desc,
 
76
&ms_mjpeg_dec_desc,
72
77
&ms_size_conv_desc,
73
78
&ms_pix_conv_desc,
74
79
&ms_join_desc,
81
86
&ms_vfw_desc,
82
87
&ms_ice_desc,
83
88
&ms_equalizer_desc,
 
89
&ms_dd_display_desc,
84
90
NULL
85
91
};
86
92