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:
066cf18
)
assrender: Do not try to add a feature to a caps features ANY
author
Sebastian Dröge
<sebastian@centricular.com>
Sun, 11 May 2014 05:56:17 +0000
(07:56 +0200)
committer
Sebastian Dröge
<sebastian@centricular.com>
Sun, 11 May 2014 05:56:50 +0000
(07:56 +0200)
It does not makes sense and asserts
Based on
7f9aac386fd5d5921c80100889a5f212c0148a88
from gst-plugins-base.
ext/assrender/gstassrender.c
patch
|
blob
|
history
diff --git
a/ext/assrender/gstassrender.c
b/ext/assrender/gstassrender.c
index
a04d94e
..
68462ca
100644
(file)
--- a/
ext/assrender/gstassrender.c
+++ b/
ext/assrender/gstassrender.c
@@
-521,7
+521,9
@@
gst_ass_render_add_feature_and_intersect (GstCaps * caps,
caps_size = gst_caps_get_size (new_caps);
for (i = 0; i < caps_size; i++) {
GstCapsFeatures *features = gst_caps_get_features (new_caps, i);
- gst_caps_features_add (features, feature);
+ if (!gst_caps_features_is_any (features)) {
+ gst_caps_features_add (features, feature);
+ }
}
gst_caps_append (new_caps, gst_caps_intersect_full (caps,