Changeset 693:1ce4d6fa9b16 in mediastreamer2
- Timestamp:
- Sep 25, 2009 2:52:39 PM (4 years ago)
- Branch:
- default
- Location:
- linphone
- Files:
-
- 2 edited
-
coreapi/linphonecore.c (modified) (3 diffs)
-
linphone.kdevelop (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
linphone/coreapi/linphonecore.c
r691 r693 38 38 #endif 39 39 40 #ifdef WIN32 41 #define HAVE_EXOSIP_GET_VERSION 1 42 #endif 43 40 #define UNSTANDART_GSM_11K 1 44 41 45 42 static const char *liblinphone_version=LIBLINPHONE_VERSION; … … 667 664 #endif 668 665 666 #ifdef UNSTANDART_GSM_11K 667 static PayloadType *gsm_11k=NULL; 668 #endif 669 669 670 void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vtable, const char *config_path, void * userdata) 670 671 { … … 704 705 rtp_profile_set_payload(&av_profile,103,payload_type_h264_packetization_mode_1); 705 706 rtp_profile_set_payload(&av_profile,102,&payload_type_h264); 707 #endif 708 709 #ifdef UNSTANDART_GSM_11K 710 gsm_11k=payload_type_clone(&payload_type_gsm); 711 gsm_11k->clock_rate=11025; 712 rtp_profile_set_payload(&av_profile,96,gsm_11k); 706 713 #endif 707 714 -
linphone/linphone.kdevelop
r611 r693 11 11 <projectdirectory>.</projectdirectory> 12 12 <absoluteprojectpath>false</absoluteprojectpath> 13 <description />14 <defaultencoding />13 <description></description> 14 <defaultencoding></defaultencoding> 15 15 </general> 16 16 <kdevcustomproject> 17 17 <run> 18 18 <directoryradio>executable</directoryradio> 19 <mainprogram> /home/smorlat/sources/git/linphone/linphone</mainprogram>20 <programargs />21 <globaldebugarguments />22 <globalcwd> /home/smorlat/sources/git/linphone/linphone</globalcwd>19 <mainprogram>gtk-glade/linphone-3</mainprogram> 20 <programargs></programargs> 21 <globaldebugarguments></globaldebugarguments> 22 <globalcwd></globalcwd> 23 23 <useglobalprogram>false</useglobalprogram> 24 24 <terminal>false</terminal> … … 392 392 <build> 393 393 <buildtool>make</buildtool> 394 <builddir />394 <builddir></builddir> 395 395 </build> 396 396 <other> 397 397 <prio>0</prio> 398 <otherbin />399 <defaulttarget />400 <otheroptions />398 <otherbin></otherbin> 399 <defaulttarget></defaulttarget> 400 <otheroptions></otheroptions> 401 401 <selectedenvironment>default</selectedenvironment> 402 402 <environments> … … 409 409 <prio>0</prio> 410 410 <dontact>false</dontact> 411 <makebin />412 <defaulttarget />413 <makeoptions />411 <makebin></makebin> 412 <defaulttarget></defaulttarget> 413 <makeoptions></makeoptions> 414 414 <selectedenvironment>default</selectedenvironment> 415 415 <environments> … … 420 420 <kdevdebugger> 421 421 <general> 422 <dbgshell />423 <gdbpath />424 <configGdbScript />425 <runShellScript />426 <runGdbScript />422 <dbgshell></dbgshell> 423 <gdbpath></gdbpath> 424 <configGdbScript></configGdbScript> 425 <runShellScript></runShellScript> 426 <runGdbScript></runGdbScript> 427 427 <breakonloadinglibs>true</breakonloadinglibs> 428 428 <separatetty>false</separatetty> … … 527 527 </codecompletion> 528 528 <creategettersetter> 529 <prefixGet />529 <prefixGet></prefixGet> 530 530 <prefixSet>set</prefixSet> 531 531 <prefixVariable>m_,_</prefixVariable>
Note: See TracChangeset
for help on using the changeset viewer.
