summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-03-08 15:16:22 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-03-08 15:16:22 +0000
commit789b43ff08eca27ea9fa980bbe504b4ed5c25338 (patch)
tree9602cd9269665010366c71cb4c8332c8c0d56556
parent2c925d117b427dcbe7a4a121302e55c5ca08e7c6 (diff)
downloadtotem-789b43ff08eca27ea9fa980bbe504b4ed5c25338.tar.gz
Fix playback of Ogg Vorbis files by checking whether we have video before
2007-03-08 Bastien Nocera <hadess@hadess.net> * src/backend/bacon-video-widget-xine.c: (bacon_video_widget_open_with_subtitle): Fix playback of Ogg Vorbis files by checking whether we have video before checking if it's supported, patch by Frédéric Crozat (Closes: #405883) svn path=/branches/gnome-2-16/; revision=4097
-rw-r--r--ChangeLog8
-rw-r--r--src/backend/bacon-video-widget-xine.c6
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dea7b9b4..bdddbdd48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-08 Bastien Nocera <hadess@hadess.net>
+
+ * src/backend/bacon-video-widget-xine.c:
+ (bacon_video_widget_open_with_subtitle): Fix playback
+ of Ogg Vorbis files by checking whether we have video
+ before checking if it's supported, patch by Frédéric Crozat
+ (Closes: #405883)
+
2007-02-05 Bastien Nocera <hadess@hadess.net>
* data/mime-type-list.txt: Add audio/x-wavpack to the supported
diff --git a/src/backend/bacon-video-widget-xine.c b/src/backend/bacon-video-widget-xine.c
index 61ed36ef1..790224145 100644
--- a/src/backend/bacon-video-widget-xine.c
+++ b/src/backend/bacon-video-widget-xine.c
@@ -2206,8 +2206,10 @@ bacon_video_widget_open_with_subtitle (BaconVideoWidget *bvw, const char *mrl,
return FALSE;
}
- if (xine_get_stream_info (bvw->priv->stream,
- XINE_STREAM_INFO_VIDEO_HANDLED) == FALSE
+ if ((xine_get_stream_info (bvw->priv->stream,
+ XINE_STREAM_INFO_HAS_VIDEO) &&
+ xine_get_stream_info (bvw->priv->stream,
+ XINE_STREAM_INFO_VIDEO_HANDLED) == FALSE)
|| (xine_get_stream_info (bvw->priv->stream,
XINE_STREAM_INFO_HAS_VIDEO) == FALSE
&& xine_get_stream_info (bvw->priv->stream,