projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
15c712c
)
gst: Set alignment at the correct place of GstAllocationParams
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Wed, 8 Aug 2012 14:12:20 +0000
(16:12 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Wed, 8 Aug 2012 15:41:19 +0000
(17:41 +0200)
gst-libs/gst/video/gstvideoencoder.c
patch
|
blob
|
history
gst-libs/gst/video/gstvideofilter.c
patch
|
blob
|
history
sys/ximage/ximagesink.c
patch
|
blob
|
history
sys/xvimage/xvimagesink.c
patch
|
blob
|
history
diff --git
a/gst-libs/gst/video/gstvideoencoder.c
b/gst-libs/gst/video/gstvideoencoder.c
index
40d0d47
..
5b96569
100644
(file)
--- a/
gst-libs/gst/video/gstvideoencoder.c
+++ b/
gst-libs/gst/video/gstvideoencoder.c
@@
-765,7
+765,7
@@
gst_video_encoder_propose_allocation_default (GstVideoEncoder * encoder,
if (gst_query_get_n_allocation_pools (query) == 0) {
GstStructure *structure;
GstAllocator *allocator = NULL;
if (gst_query_get_n_allocation_pools (query) == 0) {
GstStructure *structure;
GstAllocator *allocator = NULL;
- GstAllocationParams params = { 0,
0, 0, 15,
};
+ GstAllocationParams params = { 0,
15, 0, 0
};
if (gst_query_get_n_allocation_params (query) > 0)
gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms);
if (gst_query_get_n_allocation_params (query) > 0)
gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms);
diff --git
a/gst-libs/gst/video/gstvideofilter.c
b/gst-libs/gst/video/gstvideofilter.c
index
a29a58b
..
017b0ca
100644
(file)
--- a/
gst-libs/gst/video/gstvideofilter.c
+++ b/
gst-libs/gst/video/gstvideofilter.c
@@
-82,7
+82,7
@@
gst_video_filter_propose_allocation (GstBaseTransform * trans,
if (gst_query_get_n_allocation_pools (query) == 0) {
GstStructure *structure;
GstAllocator *allocator = NULL;
if (gst_query_get_n_allocation_pools (query) == 0) {
GstStructure *structure;
GstAllocator *allocator = NULL;
- GstAllocationParams params = { 0,
0, 0, 15
, };
+ GstAllocationParams params = { 0,
15, 0, 0
, };
if (gst_query_get_n_allocation_params (query) > 0)
gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms);
if (gst_query_get_n_allocation_params (query) > 0)
gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms);
diff --git
a/sys/ximage/ximagesink.c
b/sys/ximage/ximagesink.c
index
9a70ac7
..
6fa3a35
100644
(file)
--- a/
sys/ximage/ximagesink.c
+++ b/
sys/ximage/ximagesink.c
@@
-1079,7
+1079,7
@@
gst_ximagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
GstBufferPool *newpool, *oldpool;
const GValue *par;
gint size;
GstBufferPool *newpool, *oldpool;
const GValue *par;
gint size;
- static GstAllocationParams params = { 0,
0, 0, 15
, };
+ static GstAllocationParams params = { 0,
15, 0, 0
, };
ximagesink = GST_XIMAGESINK (bsink);
ximagesink = GST_XIMAGESINK (bsink);
diff --git
a/sys/xvimage/xvimagesink.c
b/sys/xvimage/xvimagesink.c
index
1c63c45
..
e631b2a
100644
(file)
--- a/
sys/xvimage/xvimagesink.c
+++ b/
sys/xvimage/xvimagesink.c
@@
-1555,7
+1555,7
@@
gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
gint display_par_n, display_par_d; /* display's PAR */
guint num, den;
gint size;
gint display_par_n, display_par_d; /* display's PAR */
guint num, den;
gint size;
- static GstAllocationParams params = { 0,
0, 0, 15
, };
+ static GstAllocationParams params = { 0,
15, 0, 0
, };
xvimagesink = GST_XVIMAGESINK (bsink);
xvimagesink = GST_XVIMAGESINK (bsink);