diff --git a/ChangeLog b/ChangeLog index 8ddf8b7020..662b9aa7f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2006-02-07 Andy Wingo + * libs/gst/base/gstcollectpads.c (gst_collect_pads_chain): Only + update last_stop if we're in TIME format and the timestamp is + valid. + + * libs/gst/base/gstcollectpads.c (gst_collect_pads_event) + * libs/gst/base/gstbasetransform.c (gst_base_transform_eventfunc): + * libs/gst/base/gstbasesink.c (gst_base_sink_configure_segment): + If we get a new newsegment with a different format, adapt + accordingly. + + * gst/gstclock.c (gst_clock_set_calibration): Accept a numerator + of 0. Not a problem, really. + * libs/gst/base/gstbasesink.c (gst_base_sink_chain_unlocked): Only warn if sync=true. diff --git a/gst/gstclock.c b/gst/gstclock.c index 8e9d1b0356..afb07375c1 100644 --- a/gst/gstclock.c +++ b/gst/gstclock.c @@ -798,7 +798,7 @@ gst_clock_set_calibration (GstClock * clock, GstClockTime internal, GstClockTime external, GstClockTime rate_num, GstClockTime rate_denom) { g_return_if_fail (GST_IS_CLOCK (clock)); - g_return_if_fail (rate_num > 0); + g_return_if_fail (rate_num >= 0); g_return_if_fail (rate_denom > 0); g_return_if_fail (internal <= gst_clock_get_internal_time (clock)); diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 8fbc671a69..4c2f0b7fb9 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -471,6 +471,10 @@ gst_base_sink_configure_segment (GstBaseSink * basesink, GstPad * pad, &start, &stop, &time); GST_OBJECT_LOCK (basesink); + + if (segment->format != format) + gst_segment_init (segment, format); + gst_segment_set_newsegment (segment, update, rate, format, start, stop, time); GST_DEBUG_OBJECT (basesink, diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index 1331c65ab8..f944721003 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -1099,6 +1099,9 @@ gst_base_transform_eventfunc (GstBaseTransform * trans, GstEvent * event) gst_event_parse_new_segment (event, &update, &rate, &format, &start, &stop, &time); + if (trans->segment.format != format) + gst_segment_init (&trans->segment, format); + gst_segment_set_newsegment (&trans->segment, update, rate, format, start, stop, time); diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index ca9a8dc78e..77aa741c26 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -729,6 +729,9 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event) ", stop %" GST_TIME_FORMAT, GST_TIME_ARGS (start), GST_TIME_ARGS (stop)); + if (data->segment.format != format) + gst_segment_init (&data->segment, format); + gst_segment_set_newsegment (&data->segment, update, rate, format, start, stop, time); @@ -791,8 +794,11 @@ gst_collect_pads_chain (GstPad * pad, GstBuffer * buffer) /* One more pad has data queued */ pads->queuedpads++; gst_buffer_replace (&data->buffer, buffer); - gst_segment_set_last_stop (&data->segment, GST_FORMAT_TIME, - GST_BUFFER_TIMESTAMP (buffer)); + + if (data->segment.format == GST_FORMAT_TIME + && GST_BUFFER_TIMESTAMP_IS_VALID (buffer)) + gst_segment_set_last_stop (&data->segment, GST_FORMAT_TIME, + GST_BUFFER_TIMESTAMP (buffer)); /* Check if our collected condition is matched and call the collected function if it is */ diff --git a/po/af.po b/po/af.po index 11f2e9b5c9..d0a3b95388 100644 --- a/po/af.po +++ b/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-12-05 11:45+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans \n" @@ -632,11 +632,11 @@ msgstr "le msgid "Internal data flow error." msgstr "Interne datavloeifout." -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "Interne datavloeiprobleem." -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Interne datavloeifout." diff --git a/po/az.po b/po/az.po index 1ce23c5cc9..e22ea26e03 100644 --- a/po/az.po +++ b/po/az.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer-0.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-03-19 18:40+0200\n" "Last-Translator: Metin Amiroff \n" "Language-Team: Azerbaijani \n" @@ -618,11 +618,11 @@ msgstr "" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 msgid "Internal data stream error." msgstr "" diff --git a/po/bg.po b/po/bg.po index da3de3c1d4..7b0512852d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-12-03 16:02+0200\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" @@ -633,11 +633,11 @@ msgstr "не е позволен празен конвейер" msgid "Internal data flow error." msgstr "Вътрешна грешка на потока от данни." -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "Вътрешен проблем на потока от данни." -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Вътрешна грешка на потока от данни." diff --git a/po/ca.po b/po/ca.po index cc3604e644..a5f301546b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-12-02 17:43+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -635,11 +635,11 @@ msgstr "no es permet un conducte buit" msgid "Internal data flow error." msgstr "S'ha produït un error intern de flux de dades." -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "Hi ha un problema intern de flux de dades." -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "S'ha produït un error intern de flux de dades." diff --git a/po/cs.po b/po/cs.po index f5349dbb88..474a9477fd 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-04-15 14:36+0200\n" "Last-Translator: Miloslav Trmac \n" "Language-Team: Czech \n" @@ -646,11 +646,11 @@ msgstr "prázdná roura není povolena" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Interní chyba GStreamer: problém při vyplňování. Ohlaste tuto chybu." diff --git a/po/de.po b/po/de.po index 3d6f230877..24929af664 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-06-05 09:32+0100\n" "Last-Translator: Roland Illig \n" "Language-Team: German \n" @@ -678,11 +678,11 @@ msgstr "Leere Leitung ist nicht erlaubt" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index ce56fcf02c..24d40e0eb8 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-04-26 10:36-0400\n" "Last-Translator: Gareth Owen \n" "Language-Team: English (British) \n" @@ -640,11 +640,11 @@ msgstr "empty pipeline not allowed" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Internal GStreamer error: pad problem. File a bug." diff --git a/po/fr.po b/po/fr.po index 147134f84b..8f1caf5fe1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GStreamer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-01-13 16:52+0100\n" "Last-Translator: Julien Moutte \n" "Language-Team: French \n" @@ -661,11 +661,11 @@ msgstr "tube vide non autorisé" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 msgid "Internal data stream error." msgstr "" diff --git a/po/it.po b/po/it.po index 8127a51c27..7f2b00b62f 100644 --- a/po/it.po +++ b/po/it.po @@ -108,7 +108,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-12-02 19:48+0100\n" "Last-Translator: Luca Ferretti \n" "Language-Team: Italian \n" @@ -737,11 +737,11 @@ msgstr "pipeline vuota non consentito" msgid "Internal data flow error." msgstr "Errore interno nel flusso di dati." -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "Problema interno nel flusso di dati." -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Errore interno nel flusso di dati." diff --git a/po/nb.po b/po/nb.po index 0daf04a96b..29ba2c69b3 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-02-17 12:00+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmaal \n" @@ -620,11 +620,11 @@ msgstr "" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 msgid "Internal data stream error." msgstr "" diff --git a/po/nl.po b/po/nl.po index a1f6f86aaa..66f647d9c3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-08-05 16:56+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" @@ -650,11 +650,11 @@ msgstr "lege pijplijn niet toegelaten" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Interne GStreamer-fout: padprobleem. Stuur een foutrapport." diff --git a/po/ru.po b/po/ru.po index 8b66f9a2e0..a797fe1adc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-02-15 22:33+0300\n" "Last-Translator: Peter Astakhov \n" "Language-Team: Russian \n" @@ -660,11 +660,11 @@ msgstr "" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "" diff --git a/po/sq.po b/po/sq.po index 70cc335acc..72ed0a7f33 100644 --- a/po/sq.po +++ b/po/sq.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-08-07 23:46+0200\n" "Last-Translator: Laurent Dhima \n" "Language-Team: Albanian \n" @@ -647,11 +647,11 @@ msgstr "nuk lejohet konduktori bosh" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Gabim i brendshëm i GStreamer: problem me shtegun. Raporto bug." diff --git a/po/sr.po b/po/sr.po index 3fada38efd..5c58edfea9 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-01-27 16:58+0100\n" "Last-Translator: Danilo Segan \n" "Language-Team: Serbian \n" @@ -656,11 +656,11 @@ msgstr "није допуштен празан цевовод" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Унутрашња грешка у ГСтримеру: неприлика са попуном. Пријавите грешку." diff --git a/po/sv.po b/po/sv.po index 17c2d7a311..e177543b88 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.7pre2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-12-21 14:49+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -656,13 +656,13 @@ msgstr "tom rörledning är inte tillåtet" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" # Richard Hult säger: "Pad" i gstreamer betyder ungefär "kontakt", man # kopplar ihop två element via deras "pads". -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Internt GStreamer-fel: kontaktproblem. Skicka en felrapport." diff --git a/po/tr.po b/po/tr.po index 655cf55d94..89018d2960 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2004-04-03 03:14+0300\n" "Last-Translator: Baris Cicek \n" "Language-Team: Turkish \n" @@ -647,11 +647,11 @@ msgstr "boş boruhattına izin verilmiyor" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Dahili GStreamer hatası: doldurma sorunu. Hata bildiriminde bulunun." diff --git a/po/uk.po b/po/uk.po index 22d393aebb..5f1abbb23a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-11-26 15:16+0300\n" "Last-Translator: Maxim V. Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -630,11 +630,11 @@ msgstr "порожній канал не допускається" msgid "Internal data flow error." msgstr "Помилка внутрішнього потоку даних." -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "Помилка внутрішнього потоку даних." -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Помилка внутрішнього потоку даних." diff --git a/po/vi.po b/po/vi.po index 6d92aaf054..e242be68e7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-12-05 21:38+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -638,11 +638,11 @@ msgstr "không cho phép đường ống trống" msgid "Internal data flow error." msgstr "Lỗi luồng dữ liệu nội bộ." -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "Vấn đề luồng dữ liệu nội bộ." -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "Lỗi luồng dữ liệu nội bộ." diff --git a/po/zh_CN.po b/po/zh_CN.po index e7245984bf..df2741f208 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-12-03 00:05+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: Chinese (simplified) \n" @@ -617,11 +617,11 @@ msgstr "" msgid "Internal data flow error." msgstr "内部数据流错误。" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "内部数据流问题。" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "内部数据流错误。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 8801a11631..a6adfbcdc6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-06 21:47+0100\n" +"POT-Creation-Date: 2006-02-07 14:15+0100\n" "PO-Revision-Date: 2005-04-27 14:55+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -640,11 +640,11 @@ msgstr "不允許使用沒有內容的管線" msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesink.c:1226 +#: libs/gst/base/gstbasesink.c:1233 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:1354 +#: libs/gst/base/gstbasesink.c:1363 #, fuzzy msgid "Internal data stream error." msgstr "GStreamer 內部錯誤：線程發生問題。請匯報錯誤。" diff --git a/win32/common/config.h b/win32/common/config.h index c9480f3eaf..f6d55acacc 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -33,7 +33,7 @@ #define GST_PACKAGE_NAME "GStreamer CVS/prerelease" /* Define the version */ -#define GST_VERSION "0.10.2.1" +#define GST_VERSION "0.10.2.2" /* Define the MAJOR.MINOR version */ #define GST_MAJORMINOR "0.10" @@ -216,7 +216,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.2.1" +#define VERSION "0.10.2.2" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */