diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-17 17:17:11 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-17 17:17:11 +0100 |
| commit | 07cc855b242e8ff757786bd2320f4db74e99cdfa (patch) | |
| tree | 69da7fbaaab21d5ec37f9113bae0e05f89ae8969 /gst/rtpmanager/rtpsource.h | |
| parent | 105650127e90982d96dd50971adcf90971a945d2 (diff) | |
| parent | 7df81223220600b7e27f1fdc1be25891dc63bdba (diff) | |
Merge branch 'master' into 0.11
Conflicts:
ext/speex/gstspeexenc.c
gst/rtpmanager/rtpsession.c
Diffstat (limited to 'gst/rtpmanager/rtpsource.h')
| -rw-r--r-- | gst/rtpmanager/rtpsource.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gst/rtpmanager/rtpsource.h b/gst/rtpmanager/rtpsource.h index 398634c23..ca95dff25 100644 --- a/gst/rtpmanager/rtpsource.h +++ b/gst/rtpmanager/rtpsource.h @@ -172,6 +172,11 @@ struct _RTPSource { GList *conflicting_addresses; GQueue *retained_feedback; + + gboolean send_pli; + gboolean send_fir; + guint8 current_send_fir_seqnum; + gint last_fir_count; }; struct _RTPSourceClass { |