summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2007-01-14 18:41:29 +0000
committerphintuka <phintuka>2007-01-14 18:41:29 +0000
commit01cdd2c3450a446b91fd2ba1a1a6dd4105d891a1 (patch)
tree039863ddc4c107efe7d4e1e7cf7efaf601366c90
parente06fbfdd73d5dc3a9e38d85cc87aac20ebf6119e (diff)
downloadxineliboutput-01cdd2c3450a446b91fd2ba1a1a6dd4105d891a1.tar.gz
xineliboutput-01cdd2c3450a446b91fd2ba1a1a6dd4105d891a1.tar.bz2
Fixed using video driver "none"
-rw-r--r--xine_frontend.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/xine_frontend.c b/xine_frontend.c
index 0eccc363..3d6a0fdf 100644
--- a/xine_frontend.c
+++ b/xine_frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_frontend.c,v 1.29 2007-01-01 06:41:43 phintuka Exp $
+ * $Id: xine_frontend.c,v 1.30 2007-01-14 18:41:29 phintuka Exp $
*
*/
@@ -498,11 +498,16 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver,
this->playback_finished = 0;
/* create video port */
-
- this->video_port = xine_open_video_driver(this->xine,
- video_driver,
- this->xine_visual_type,
- (void *) &(this->vis));
+ if(video_driver && !strcmp(video_driver, "none"))
+ this->video_port = xine_open_video_driver(this->xine,
+ video_driver,
+ XINE_VISUAL_TYPE_NONE,
+ NULL);
+ else
+ this->video_port = xine_open_video_driver(this->xine,
+ video_driver,
+ this->xine_visual_type,
+ (void *) &(this->vis));
if(!this->video_port) {
LOGMSG("fe_xine_init: xine_open_video_driver(\"%s\") failed",
video_driver?video_driver:"(NULL)");
@@ -1480,9 +1485,9 @@ static char *fe_grab(frontend_t *this_gen, int *size, int jpeg,
frame->format);
break;
}
+
jpeg_finish_compress(&cinfo);
jpeg_destroy_compress(&cinfo);
-
frame->free(frame);
*size = jcd.size;