Skip to content

Commit 3cc2928

Browse files
committed
DO_NOT_MERGE: temporary remove APIVERSION dependency
1 parent b69459d commit 3cc2928

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

softhddevice.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,6 @@ bool cSoftHdDevice::Poll(__attribute__ ((unused)) cPoller & poller, int timeoutM
921921
return false;
922922
}
923923

924-
#if APIVERSNUM >= 30014
925924
/**
926925
* Force a decoder drain and return true, if all buffers have been played out
927926
*
@@ -955,7 +954,6 @@ bool cSoftHdDevice::Drain(void)
955954

956955
return true;
957956
}
958-
#endif
959957

960958
/**
961959
* Sets the video display format

softhddevice.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ class cSoftHdDevice : public cDevice, public IEventReceiver, public cStatus {
168168
virtual void Freeze(void);
169169
virtual void StillPicture(const uchar *, int);
170170
virtual bool Poll(cPoller &, int = 0);
171-
#if APIVERSNUM >= 30014
172171
virtual bool Drain(void);
173-
#endif
172+
174173
// Image Grab facilities
175174
virtual uchar *GrabImage(int &, bool, int, int, int);
176175

0 commit comments

Comments
 (0)