mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-03-04 13:48:02 +01:00
commit 90ec31fbd9
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 1de7f6ab2d4bc1af69f06079cf0f4e2cbbfdc178 Subproject commit 6aec6b9716c184c60c4bc6a5916a2471cfa8c8cd

2
configure.ac
View file

@ -441,7 +441,7 @@ AC_SUBST(GST_ALL_LDFLAGS)
dnl this really should only contain flags, not libs - they get added before dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS"
AC_SUBST(GST_PLUGIN_LDFLAGS) AC_SUBST(GST_PLUGIN_LDFLAGS)
dnl *** output files *** dnl *** output files ***

11
gst/mpegstream/gstdvddemux.c
View file

@ -1200,12 +1200,11 @@ gst_dvd_demux_synchronise_pads (GstMPEGDemux * mpeg_demux,
", threshold %" GST_TIME_FORMAT, i, ", threshold %" GST_TIME_FORMAT, i,
GST_TIME_ARGS (dvd_demux->subpicture_stream[i]->cur_ts), GST_TIME_ARGS (dvd_demux->subpicture_stream[i]->cur_ts),
GST_TIME_ARGS (threshold)); GST_TIME_ARGS (threshold));
} if (dvd_demux->subpicture_stream[i]->cur_ts < threshold) {
if (dvd_demux->subpicture_stream[i] DEMUX_CLASS (mpeg_demux)->sync_stream_to_time (mpeg_demux,
&& (dvd_demux->subpicture_stream[i]->cur_ts < threshold)) { dvd_demux->subpicture_stream[i], new_ts);
DEMUX_CLASS (mpeg_demux)->sync_stream_to_time (mpeg_demux, dvd_demux->subpicture_stream[i]->cur_ts = new_ts;
dvd_demux->subpicture_stream[i], new_ts); }
dvd_demux->subpicture_stream[i]->cur_ts = new_ts;
} }
} }
} }