summaryrefslogtreecommitdiff
path: root/src/xine-engine/video_decoder.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-09 01:09:57 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2003-01-09 01:09:57 +0000
commit85a2757ca43eaf781c662a77c5a18b2d6dcb22fe (patch)
tree38ed9d7a46cafc4dc40ad8a9bb90802a1da56d40 /src/xine-engine/video_decoder.c
parent30376100bd14ec525f3daffdaf9a084d9c9b5cee (diff)
downloadxine-lib-85a2757ca43eaf781c662a77c5a18b2d6dcb22fe.tar.gz
xine-lib-85a2757ca43eaf781c662a77c5a18b2d6dcb22fe.tar.bz2
handled/unhandled fixes. now it should work for dvd too.
CVS patchset: 3839 CVS date: 2003/01/09 01:09:57
Diffstat (limited to 'src/xine-engine/video_decoder.c')
-rw-r--r--src/xine-engine/video_decoder.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 6be4f866a..c42e217ea 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.121 2003/01/08 01:02:32 miguelfreitas Exp $
+ * $Id: video_decoder.c,v 1.122 2003/01/09 01:09:57 miguelfreitas Exp $
*
*/
@@ -106,6 +106,10 @@ void *video_decoder_loop (void *stream_gen) {
stream->metronom->handle_video_discontinuity (stream->metronom,
DISC_STREAMSTART, 0);
+
+ /* assume handled, we will known after trying to init decoder */
+ stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] =
+ stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO];
buftype_unknown = 0;
break;
@@ -267,16 +271,15 @@ void *video_decoder_loop (void *stream_gen) {
stream->video_decoder_streamtype = streamtype;
stream->video_decoder_plugin = get_video_decoder (stream, streamtype);
- if( stream->video_decoder_plugin )
- stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1;
+ stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] =
+ (stream->video_decoder_plugin != NULL);
}
if (stream->video_decoder_plugin)
stream->video_decoder_plugin->decode_data (stream->video_decoder_plugin, buf);
- if (buf->type != buftype_unknown &&
- (!stream->video_decoder_plugin ||
- !stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED])) {
+ if (buf->type != buftype_unknown &&
+ !stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED]) {
xine_log (stream->xine, XINE_LOG_MSG,
"video_decoder: no plugin available to handle '%s'\n",
buf_video_name( buf->type ) );