summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohns <johns98@gmx.net>2015-02-12 10:30:50 +0100
committerJohns <johns98@gmx.net>2015-02-12 10:30:50 +0100
commit1d06c5ba59ff4175b9144764f9750f9143c066fb (patch)
tree329ffd9cc27fa3ecdb70dc1d32195242362ee7f4
parent2ceeb6db4062ca57eaad5e25f86f68328035233c (diff)
downloadvdr-plugin-softhddevice-1d06c5ba59ff4175b9144764f9750f9143c066fb.tar.gz
vdr-plugin-softhddevice-1d06c5ba59ff4175b9144764f9750f9143c066fb.tar.bz2
Compile with vdr 2.1.10
-rw-r--r--ChangeLog7
-rw-r--r--softhddevice.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 79bf45a..6538b99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+User johns
+Date:
+
+ Compile with vdr 2.1.10.
+ Fix bug: AVCodecContext.framerate not supported.
+ Use video stream frame rate for A/V sync.
+
User Antti Seppälä
Date: Thu Oct 16 14:15:15 CEST 2014
diff --git a/softhddevice.cpp b/softhddevice.cpp
index b3467a5..eb07e48 100644
--- a/softhddevice.cpp
+++ b/softhddevice.cpp
@@ -496,7 +496,7 @@ void cSoftOsd::Flush(void)
}
LOCK_PIXMAPS;
- while ((pm = RenderPixmaps())) {
+ while ((pm = (dynamic_cast < cPixmapMemory * >(RenderPixmaps())))) {
int x;
int y;
int w;
@@ -513,7 +513,7 @@ void cSoftOsd::Flush(void)
#endif
OsdDrawARGB(x, y, w, h, pm->Data());
- delete pm;
+ DestroyPixmap(pm);
}
Dirty = 0;
}