summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohns <johns98@gmx.net>2012-02-19 20:52:57 +0100
committerJohns <johns98@gmx.net>2012-02-19 20:52:57 +0100
commitc4ad13c53ffa5821f6b6dcc9b4f6b1a93be0019f (patch)
treea39b9286c14ad671abeadefd79066c9e8b97c8a0
parent98f73f2199932362ba6f6a82e1f627b01e29b758 (diff)
downloadvdr-plugin-softhddevice-c4ad13c53ffa5821f6b6dcc9b4f6b1a93be0019f.tar.gz
vdr-plugin-softhddevice-c4ad13c53ffa5821f6b6dcc9b4f6b1a93be0019f.tar.bz2
Fix bug: Grabbing JPG image fails while suspended.
-rw-r--r--ChangeLog1
-rw-r--r--softhddev.c15
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 92a44c4..a2f4d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
User johns
Date:
+ Fix bug: Grabbing a JPG image fails while suspended.
Add support for hot keys.
Add support to use characters input in edit mode.
Adds trick speed support.
diff --git a/softhddev.c b/softhddev.c
index 3a83099..f33d739 100644
--- a/softhddev.c
+++ b/softhddev.c
@@ -1186,15 +1186,20 @@ uint8_t *CreateJpeg(uint8_t * image, int raw_size, int *size, int quality,
uint8_t *GrabImage(int *size, int jpeg, int quality, int width, int height)
{
if (jpeg) {
- uint8_t *jpg_image;
uint8_t *image;
- int raw_size = 0;
+ int raw_size;
+ raw_size = 0;
image = VideoGrab(&raw_size, &width, &height, 0);
- jpg_image = CreateJpeg(image, size, quality, width, height);
+ if (image) { // can fail, suspended, ...
+ uint8_t *jpg_image;
- free(image);
- return jpg_image;
+ jpg_image = CreateJpeg(image, size, quality, width, height);
+
+ free(image);
+ return jpg_image;
+ }
+ return NULL;
}
if (width != -1 && height != -1) {
Warning(_("softhddev: scaling unsupported\n"));