summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohns <johns98@gmx.net>2013-04-03 16:48:00 +0200
committerJohns <johns98@gmx.net>2013-04-03 16:48:00 +0200
commit4e3f5f5414b29c69b5717568f4b40dd9c40c5d43 (patch)
tree8a32e2291017f653e37a3e1b6196764f0cb078ce
parent23b0e0d599a89c549f50fbad939906f367630767 (diff)
downloadvdr-plugin-softhddevice-4e3f5f5414b29c69b5717568f4b40dd9c40c5d43.tar.gz
vdr-plugin-softhddevice-4e3f5f5414b29c69b5717568f4b40dd9c40c5d43.tar.bz2
Fix crash, when sillpicture is called in suspend mode.
-rw-r--r--ChangeLog1
-rw-r--r--softhddev.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f59cec..086268d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
User johns
Date:
+ Fix crash, when sillpicture is called in suspend mode.
Add workaround for zero width+height and ffmpeg >= 1.2.
User johns
diff --git a/softhddev.c b/softhddev.c
index b68b62b..9ea4009 100644
--- a/softhddev.c
+++ b/softhddev.c
@@ -2579,6 +2579,10 @@ void StillPicture(const uint8_t * data, int size)
int i;
int old_video_hardware_decoder;
+ // might be called in Suspended Mode
+ if (MyVideoStream->SkipStream->Decoder && MyVideoStream->SkipStream) {
+ return;
+ }
// must be a PES start code
if (size < 9 || !data || data[0] || data[1] || data[2] != 0x01) {
Error(_("[softhddev] invalid still video packet\n"));