Mageia Bugzilla – Attachment 4240 Details for
Bug 10924
GST-libav uses functions from development GStreamer
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Proposed patch that just comments out the group_id code.
gst-libav-1.1.3-gstreamer-1.0.x.patch (text/plain), 3.52 KB, created by
Juan Magallon
on 2013-08-05 01:57:41 CEST
(
hide
)
Description:
Proposed patch that just comments out the group_id code.
Filename:
MIME Type:
Creator:
Juan Magallon
Created:
2013-08-05 01:57:41 CEST
Size:
3.52 KB
patch
obsolete
>diff -up ./configure.ac.gstreamer-1_0_x ./configure.ac >--- ./configure.ac.gstreamer-1_0_x 2013-07-11 15:12:51.442552795 +0000 >+++ ./configure.ac 2013-07-11 15:14:12.878259068 +0000 >@@ -45,8 +45,8 @@ AG_GST_LIBTOOL_PREPARE > AS_LIBTOOL(GST, 103, 0, 103) > > dnl *** required versions of GStreamer stuff *** >-GST_REQ=1.1.3 >-GST_PBREQ=1.1.3 >+GST_REQ=1.0.0 >+GST_PBREQ=1.0.0 > > ORC_REQ=0.4.16 > ORC_CHECK([$ORC_REQ]) >diff -up ./ext/libav/gstavcodecmap.c.gstreamer-1_0_x ./ext/libav/gstavcodecmap.c >--- ./ext/libav/gstavcodecmap.c.gstreamer-1_0_x 2013-07-11 14:52:48.000000000 +0000 >+++ ./ext/libav/gstavcodecmap.c 2013-07-11 15:12:51.462551985 +0000 >@@ -2437,11 +2437,6 @@ static const PixToFmt pixtofmttable[] = > {GST_VIDEO_FORMAT_I420_10BE, PIX_FMT_YUV420P10BE}, > {GST_VIDEO_FORMAT_I422_10LE, PIX_FMT_YUV422P10LE}, > {GST_VIDEO_FORMAT_I422_10BE, PIX_FMT_YUV422P10BE}, >- {GST_VIDEO_FORMAT_Y444_10LE, PIX_FMT_YUV444P10LE}, >- {GST_VIDEO_FORMAT_Y444_10BE, PIX_FMT_YUV444P10BE}, >- {GST_VIDEO_FORMAT_GBR, PIX_FMT_GBRP}, >- {GST_VIDEO_FORMAT_GBR_10LE, PIX_FMT_GBRP10LE}, >- {GST_VIDEO_FORMAT_GBR_10BE, PIX_FMT_GBRP10BE}, > }; > > GstVideoFormat >diff -up ./ext/libav/gstavdemux.c.gstreamer-1_0_x ./ext/libav/gstavdemux.c >--- ./ext/libav/gstavdemux.c.gstreamer-1_0_x 2013-07-29 12:19:38.000000000 +0200 >+++ ./ext/libav/gstavdemux.c 2013-08-05 01:45:02.390142381 +0200 >@@ -61,8 +61,8 @@ struct _GstFFMpegDemux > /* We need to keep track of our pads, so we do so here. */ > GstPad *sinkpad; > >- gboolean have_group_id; >- guint group_id; >+// gboolean have_group_id; >+// guint group_id; > > AVFormatContext *context; > gboolean opened; >@@ -267,8 +267,8 @@ gst_ffmpegdemux_init (GstFFMpegDemux * d > g_rec_mutex_init (&demux->task_lock); > gst_task_set_lock (demux->task, &demux->task_lock); > >- demux->have_group_id = FALSE; >- demux->group_id = G_MAXUINT; >+// demux->have_group_id = FALSE; >+// demux->group_id = G_MAXUINT; > > demux->opened = FALSE; > demux->context = NULL; >@@ -1030,20 +1030,20 @@ gst_ffmpegdemux_get_stream (GstFFMpegDem > gst_pad_create_stream_id_printf (pad, GST_ELEMENT_CAST (demux), "%03u", > avstream->index); > >- event = gst_pad_get_sticky_event (demux->sinkpad, GST_EVENT_STREAM_START, 0); >- if (event) { >- if (gst_event_parse_group_id (event, &demux->group_id)) >- demux->have_group_id = TRUE; >- else >- demux->have_group_id = FALSE; >- gst_event_unref (event); >- } else if (!demux->have_group_id) { >- demux->have_group_id = TRUE; >- demux->group_id = gst_util_group_id_next (); >- } >+// event = gst_pad_get_sticky_event (demux->sinkpad, GST_EVENT_STREAM_START, 0); >+// if (event) { >+// if (gst_event_parse_group_id (event, &demux->group_id)) >+// demux->have_group_id = TRUE; >+// else >+// demux->have_group_id = FALSE; >+// gst_event_unref (event); >+// } else if (!demux->have_group_id) { >+// demux->have_group_id = TRUE; >+// demux->group_id = gst_util_group_id_next (); >+// } > event = gst_event_new_stream_start (stream_id); >- if (demux->have_group_id) >- gst_event_set_group_id (event, demux->group_id); >+// if (demux->have_group_id) >+// gst_event_set_group_id (event, demux->group_id); > > gst_pad_push_event (pad, event); > g_free (stream_id); >@@ -1895,8 +1895,8 @@ gst_ffmpegdemux_change_state (GstElement > NULL); > g_list_free (demux->cached_events); > demux->cached_events = NULL; >- demux->have_group_id = FALSE; >- demux->group_id = G_MAXUINT; >+// demux->have_group_id = FALSE; >+// demux->group_id = G_MAXUINT; > break; > default: > break;
diff -up ./configure.ac.gstreamer-1_0_x ./configure.ac --- ./configure.ac.gstreamer-1_0_x 2013-07-11 15:12:51.442552795 +0000 +++ ./configure.ac 2013-07-11 15:14:12.878259068 +0000 @@ -45,8 +45,8 @@ AG_GST_LIBTOOL_PREPARE AS_LIBTOOL(GST, 103, 0, 103) dnl *** required versions of GStreamer stuff *** -GST_REQ=1.1.3 -GST_PBREQ=1.1.3 +GST_REQ=1.0.0 +GST_PBREQ=1.0.0 ORC_REQ=0.4.16 ORC_CHECK([$ORC_REQ]) diff -up ./ext/libav/gstavcodecmap.c.gstreamer-1_0_x ./ext/libav/gstavcodecmap.c --- ./ext/libav/gstavcodecmap.c.gstreamer-1_0_x 2013-07-11 14:52:48.000000000 +0000 +++ ./ext/libav/gstavcodecmap.c 2013-07-11 15:12:51.462551985 +0000 @@ -2437,11 +2437,6 @@ static const PixToFmt pixtofmttable[] = {GST_VIDEO_FORMAT_I420_10BE, PIX_FMT_YUV420P10BE}, {GST_VIDEO_FORMAT_I422_10LE, PIX_FMT_YUV422P10LE}, {GST_VIDEO_FORMAT_I422_10BE, PIX_FMT_YUV422P10BE}, - {GST_VIDEO_FORMAT_Y444_10LE, PIX_FMT_YUV444P10LE}, - {GST_VIDEO_FORMAT_Y444_10BE, PIX_FMT_YUV444P10BE}, - {GST_VIDEO_FORMAT_GBR, PIX_FMT_GBRP}, - {GST_VIDEO_FORMAT_GBR_10LE, PIX_FMT_GBRP10LE}, - {GST_VIDEO_FORMAT_GBR_10BE, PIX_FMT_GBRP10BE}, }; GstVideoFormat diff -up ./ext/libav/gstavdemux.c.gstreamer-1_0_x ./ext/libav/gstavdemux.c --- ./ext/libav/gstavdemux.c.gstreamer-1_0_x 2013-07-29 12:19:38.000000000 +0200 +++ ./ext/libav/gstavdemux.c 2013-08-05 01:45:02.390142381 +0200 @@ -61,8 +61,8 @@ struct _GstFFMpegDemux /* We need to keep track of our pads, so we do so here. */ GstPad *sinkpad; - gboolean have_group_id; - guint group_id; +// gboolean have_group_id; +// guint group_id; AVFormatContext *context; gboolean opened; @@ -267,8 +267,8 @@ gst_ffmpegdemux_init (GstFFMpegDemux * d g_rec_mutex_init (&demux->task_lock); gst_task_set_lock (demux->task, &demux->task_lock); - demux->have_group_id = FALSE; - demux->group_id = G_MAXUINT; +// demux->have_group_id = FALSE; +// demux->group_id = G_MAXUINT; demux->opened = FALSE; demux->context = NULL; @@ -1030,20 +1030,20 @@ gst_ffmpegdemux_get_stream (GstFFMpegDem gst_pad_create_stream_id_printf (pad, GST_ELEMENT_CAST (demux), "%03u", avstream->index); - event = gst_pad_get_sticky_event (demux->sinkpad, GST_EVENT_STREAM_START, 0); - if (event) { - if (gst_event_parse_group_id (event, &demux->group_id)) - demux->have_group_id = TRUE; - else - demux->have_group_id = FALSE; - gst_event_unref (event); - } else if (!demux->have_group_id) { - demux->have_group_id = TRUE; - demux->group_id = gst_util_group_id_next (); - } +// event = gst_pad_get_sticky_event (demux->sinkpad, GST_EVENT_STREAM_START, 0); +// if (event) { +// if (gst_event_parse_group_id (event, &demux->group_id)) +// demux->have_group_id = TRUE; +// else +// demux->have_group_id = FALSE; +// gst_event_unref (event); +// } else if (!demux->have_group_id) { +// demux->have_group_id = TRUE; +// demux->group_id = gst_util_group_id_next (); +// } event = gst_event_new_stream_start (stream_id); - if (demux->have_group_id) - gst_event_set_group_id (event, demux->group_id); +// if (demux->have_group_id) +// gst_event_set_group_id (event, demux->group_id); gst_pad_push_event (pad, event); g_free (stream_id); @@ -1895,8 +1895,8 @@ gst_ffmpegdemux_change_state (GstElement NULL); g_list_free (demux->cached_events); demux->cached_events = NULL; - demux->have_group_id = FALSE; - demux->group_id = G_MAXUINT; +// demux->have_group_id = FALSE; +// demux->group_id = G_MAXUINT; break; default: break;
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 10924
: 4240