gstreamer/gst-libs/gst/rtp/gstbasertppayload.c.rej
Wim Taymans 7012e88090 Merge branch 'master' into 0.11
Conflicts:
	gst-libs/gst/audio/audio.h
	gst-libs/gst/audio/gstaudiodecoder.c
	gst-libs/gst/audio/gstaudiodecoder.h
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/audio/gstbaseaudioencoder.h
	gst/playback/Makefile.am
	gst/playback/gstplaybin.c
	gst/playback/gstplaysink.c
	gst/playback/gstplaysinkvideoconvert.c
	gst/playback/gstsubtitleoverlay.c
	gst/videorate/gstvideorate.c
	gst/videoscale/gstvideoscale.c
	win32/common/libgstaudio.def
2011-09-06 15:24:32 +02:00

16 lines
402 B
Text

*************** struct _GstBaseRTPPayloadPrivate
*** 48,53 ****
guint16 next_seqnum;
gboolean perfect_rtptime;
gboolean timestamp_valid;
gint64 prop_max_ptime;
gint64 caps_max_ptime;
--- 48,54 ----
guint16 next_seqnum;
gboolean perfect_rtptime;
gboolean timestamp_valid;
+ gboolean notified_first_timestamp;
gint64 prop_max_ptime;
gint64 caps_max_ptime;