summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/xine.c12
-rw-r--r--src/xine-engine/xine_internal.h10
2 files changed, 13 insertions, 9 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 3d32d0f4d..bd37285b3 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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: xine.c,v 1.65 2001/10/07 16:57:02 guenter Exp $
+ * $Id: xine.c,v 1.66 2001/10/07 17:08:23 guenter Exp $
*
* top-level xine functions
*
@@ -648,14 +648,17 @@ int xine_set_audio_property(xine_t *this, int property, int value) {
return ~value;
}
-void xine_get_current_frame (xine_t *this, int *width, int *height,
- int *ratio_code, int *format,
- uint8_t **y, uint8_t **u, uint8_t **v) {
+int xine_get_current_frame (xine_t *this, int *width, int *height,
+ int *ratio_code, int *format,
+ uint8_t **y, uint8_t **u, uint8_t **v) {
vo_frame_t *frame;
frame = this->video_out->get_last_frame (this->video_out);
+ if (!frame)
+ return 0;
+
*width = frame->width;
*height = frame->height;
@@ -666,5 +669,6 @@ void xine_get_current_frame (xine_t *this, int *width, int *height,
*u = frame->base[1];
*v = frame->base[2];
+ return 1;
}
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 55ca7a996..01f0b8d30 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -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: xine_internal.h,v 1.47 2001/10/07 16:57:02 guenter Exp $
+ * $Id: xine_internal.h,v 1.48 2001/10/07 17:08:23 guenter Exp $
*
*/
@@ -518,10 +518,10 @@ void xine_send_event(xine_t *this, event_t *event, void *data);
* y : lumiance information
* u,v : subsample color information
*/
-void xine_get_current_frame (xine_t *this, int *width, int *height,
- int *ratio_code, int *format,
- uint8_t **y, uint8_t **u,
- uint8_t **v);
+int xine_get_current_frame (xine_t *this, int *width, int *height,
+ int *ratio_code, int *format,
+ uint8_t **y, uint8_t **u,
+ uint8_t **v);
#ifdef __cplusplus
}