summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiggi Langauf <siggi@users.sourceforge.net>2005-06-25 13:21:30 +0000
committerSiggi Langauf <siggi@users.sourceforge.net>2005-06-25 13:21:30 +0000
commit7e9859c5702f2c02da58292d7295c428dc4520c0 (patch)
treec98a290d2bef8d0307a2330abb29d9011be2d653
parentca7f6b0509afe39283168d850daf061db4f01d55 (diff)
downloadxine-lib-7e9859c5702f2c02da58292d7295c428dc4520c0.tar.gz
xine-lib-7e9859c5702f2c02da58292d7295c428dc4520c0.tar.bz2
*BUGFIX*
fix playback of non-multi Real RTSP streams CVS patchset: 7633 CVS date: 2005/06/25 13:21:30
-rw-r--r--ChangeLog2
-rw-r--r--src/input/libreal/real.c11
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a24086731..6e1804913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ xine-lib (1.1)
* added --with-external-a52dec and --with-external-libmad switches
xine-lib (1.0.2)
+ * fixed playback of single-session Real RTSP streams, such as
+ rtsp://stream.samurai.fm/broadcast/live_hi.rm
* fixed xxmc / xvmc mocomp / IDCT rendering errors caused by the big update.
* support --enable-fpic with recent versions of gcc
* clip goom fps value to >= 1 [bug #1193783]
diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index 2e455ce02..36387b7f1 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: real.c,v 1.20 2004/12/15 12:53:46 miguelfreitas Exp $
+ * $Id: real.c,v 1.21 2005/06/25 13:21:30 siggi Exp $
*
* special functions for real streams.
* adopted from joschkas real tools.
@@ -489,9 +489,12 @@ rmff_header_t *real_parse_sdp(char *data, char **stream_rules, uint32_t bandwidt
xine_buffer_strcat(*stream_rules, b);
}
- if (!desc->stream[i]->mlti_data) return NULL;
-
- len=select_mlti_data(desc->stream[i]->mlti_data, desc->stream[i]->mlti_data_size, rulematches[0], &buf);
+ if (!desc->stream[i]->mlti_data) {
+ len = 0;
+ buf = NULL;
+ }
+ else
+ len=select_mlti_data(desc->stream[i]->mlti_data, desc->stream[i]->mlti_data_size, rulematches[0], &buf);
header->streams[i]=rmff_new_mdpr(
desc->stream[i]->stream_id,