diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-29 15:00:22 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-03-29 15:00:22 +0200 |
| commit | 9e13d70b2ca4680d419d9426537f099cdcef8d03 (patch) | |
| tree | 45e1de3e6bcdd9f72d68789da8cfd9fb96cbf48f /gst-libs/gst/pbutils/descriptions.c | |
| parent | 435c340d158c872cc18db9ad1f23f049c6f82c2c (diff) | |
| parent | b47350b6e97db908448921e9700e5ff7a8764f41 (diff) | |
Merge remote-tracking branch 'origin/0.10'
Conflicts:
gst-libs/gst/video/video-overlay-composition.c
tests/check/libs/video.c
Diffstat (limited to 'gst-libs/gst/pbutils/descriptions.c')
| -rw-r--r-- | gst-libs/gst/pbutils/descriptions.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gst-libs/gst/pbutils/descriptions.c b/gst-libs/gst/pbutils/descriptions.c index 6e83f8497..6dee021fd 100644 --- a/gst-libs/gst/pbutils/descriptions.c +++ b/gst-libs/gst/pbutils/descriptions.c @@ -236,13 +236,18 @@ static const FormatInfo formats[] = { {"image/vnd.wap.wbmp", "Wireless Bitmap", 0}, /* subtitle formats with static descriptions */ - {"application/x-ass", "ASS", 0}, + {"application/x-ssa", "SubStation Alpha", 0}, + {"application/x-ass", "Advanced SubStation Alpha", 0}, + /* FIXME: add variant field to typefinder? */ + {"application/x-subtitle", N_("Subtitle"), 0}, + {"application/x-subtitle-mpl2", N_("MPL2 subtitle format"), 0}, + {"application/x-subtitle-dks", N_("DKS subtitle format"), 0}, + {"application/x-subtitle-qttext", N_("QTtext subtitle format"), 0}, {"application/x-subtitle-sami", N_("Sami subtitle format"), 0}, {"application/x-subtitle-tmplayer", N_("TMPlayer subtitle format"), 0}, {"application/x-kate", "Kate", 0}, {"subtitle/x-kate", N_("Kate subtitle format"), 0}, {"subpicture/x-dvb", "DVB subtitles", 0}, - /* add variant field to typefinder? { "application/x-subtitle", N_("subtitle"), 0}, */ /* non-audio/video/container formats */ {"hdv/aux-v", "HDV AUX-V", 0}, |