projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
e92ccff
)
Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...
author
smlee
<smlee@dev3>
Thu, 9 Jan 2014 04:47:11 +0000
(13:47 +0900)
committer
smlee
<smlee@dev3>
Thu, 9 Jan 2014 04:47:11 +0000
(13:47 +0900)
lib/service/servicemp3.cpp
patch
|
blob
|
history
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index
beee3a9
..
0e7cca9
100755
(executable)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-1134,6
+1134,11
@@
subtype_t getSubtitleType(GstPad* pad, gchar *g_codec=NULL)
subtype_t type = stUnknown;
GstCaps* caps = gst_pad_get_negotiated_caps(pad);
+ if (!caps && !g_codec)
+ {
+ caps = gst_pad_get_allowed_caps(pad);
+ }
+
if ( caps )
{
GstStructure* str = gst_caps_get_structure(caps, 0);