Update of /cvsroot/xine/xine-lib/src/demuxers
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19915
Modified Files:
demux_ogg.c
Log Message:
Properly set the video as unhandled if there are more video tracks unhandled
than handled. Thanks to Bastien Nocera in bug #1577272.
Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ogg.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- demux_ogg.c 10 Nov 2006 01:00:35 -0000 1.170
+++ demux_ogg.c 10 Nov 2006 14:53:23 -0000 1.171
@@ -143,6 +143,7 @@
int num_audio_streams;
int num_video_streams;
+ int unhandled_video_streams;
int num_spu_streams;
off_t avg_bitrate;
@@ -1178,6 +1179,7 @@
#else
this->si[stream_num]->buf_types = BUF_VIDEO_THEORA;
this->num_video_streams++;
+ this->unhandled_video_streams++;
_x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "theora");
#endif
}
@@ -1604,6 +1606,7 @@
this->num_streams = 0;
this->num_audio_streams = 0;
this->num_video_streams = 0;
+ this->unhandled_video_streams = 0;
this->num_spu_streams = 0;
this->avg_bitrate = 1;
@@ -1697,6 +1700,8 @@
_x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO,
this->num_video_streams > 0);
+ _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HANDLED,
+ this->num_video_streams > this->unhandled_video_streams);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO,
this->num_audio_streams > 0);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_MAX_SPU_CHANNEL,
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
