Changeset 1387:5a0d9235b7ad in mediastreamer2 for include/mediastreamer2/mediastream.h

Timestamp:

May 13, 2011 3:28:28 PM (2 years ago)

Author:

laurent <laurent@…>

Branch:

default

Parents:

1386:971a25697e2a (diff), 1110:432c588e5227 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with ​git://git.linphone.org/mediastreamer2.git

File:

• include/mediastreamer2/mediastream.h (modified) (3 diffs)

include/mediastreamer2/mediastream.h

@@ -78 +78 @@
         MSFilter *write_resampler;
         MSFilter *sndwrite;
+        MSFilter *volume;
 };
 
@@ -155 +156 @@
 /* retrieve RTP statistics*/
 MS2_PUBLIC void audio_stream_get_local_rtp_stats(AudioStream *stream, rtp_stats_t *stats);
+
+MS2_PUBLIC void audio_stream_change_decoder(AudioStream *stream, int payload);
+
+MS2_PUBLIC void audio_stream_free(AudioStream *stream);
 
 
@@ -259 +264 @@
 MS2_PUBLIC void video_preview_stop(VideoPreview *stream);
 
+MS2_PUBLIC void video_stream_change_decoder(VideoStream *stream, int payload);
+
 MS2_PUBLIC bool_t ms_is_ipv6(const char *address);