diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-06 23:05:43 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-06 23:05:43 +0000 |
| commit | 9ebfc5a1a9b8dd0b893ee7b22dcd6c1aeb39359c (patch) | |
| tree | 8bedf206381583510cb56d3e54020b0d7bb30bbc | |
| parent | 567a45c982f7806344426cb5495e429ab80793a3 (diff) | |
| parent | 24ac3c3cd129ceb6e181e9f36c2ade5e3ec82cc4 (diff) | |
| download | xine-lib-9ebfc5a1a9b8dd0b893ee7b22dcd6c1aeb39359c.tar.gz xine-lib-9ebfc5a1a9b8dd0b893ee7b22dcd6c1aeb39359c.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
| -rw-r--r-- | src/xine-engine/xine.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 18a9e8e9f..867394488 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -2009,9 +2009,13 @@ static int _x_get_current_frame_impl (xine_stream_t *stream, int *width, int *he break; default: + if (*img || alloc_img) { xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "xine: error, snapshot function not implemented for format 0x%x\n", frame->format); _x_abort (); + } + + required_size = 0; } if (alloc_img) { |