mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 04:35:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2012-02-14 11:19:04 +01:00
parent b10b9cf109 ac681a6efd
commit eff7037447
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/mpegtsmux/mpegtsmux.c
View file

@ -1087,11 +1087,11 @@ new_packet_m2ts (MpegTsMux * mux, guint8 * data, guint len, gint64 new_pcr)
return FALSE;
}
new_packet_common_init (mux, buf, data, len);
/* copies the TS data of 188 bytes to the m2ts buffer at an offset
of 4 bytes to leave space for writing the timestamp later */
memcpy (GST_BUFFER_DATA (buf) + 4, data, len);
/* After copying the data into the buffer, do other common init (flags and streamheaders) */
new_packet_common_init (mux, buf, data, len);
if (new_pcr < 0) {
/* If theres no pcr in current ts packet then just add the packet
@ -1198,9 +1198,10 @@ new_packet_normal_ts (MpegTsMux * mux, guint8 * data, guint len, gint64 new_pcr)
return FALSE;
}
memcpy (GST_BUFFER_DATA (buf), data, len);
/* After copying the data into the buffer, do other common init (flags and streamheaders) */
new_packet_common_init (mux, buf, data, len);
memcpy (GST_BUFFER_DATA (buf), data, len);
GST_BUFFER_TIMESTAMP (buf) = mux->last_ts;
ret = gst_pad_push (mux->srcpad, buf);

4
sys/directdraw/gstdirectdrawsink.c
View file

@ -1416,7 +1416,7 @@ gst_directdraw_sink_setup_ddraw (GstDirectDrawSink * ddrawsink)
return bRet;
}
static long FAR PASCAL
static LRESULT FAR PASCAL
WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message) {
@ -2026,7 +2026,7 @@ surface_pitch_bad:
GST_BUFFER_SIZE (surface) = size;
surface->surface = NULL;
GST_CAT_INFO_OBJECT (directdrawsink_debug, ddrawsink,
"allocating a system memory buffer of %d bytes", size);
"allocating a system memory buffer of %" G_GSIZE_FORMAT " bytes", size);
#endif