diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index bb0e856b7..8c6e19094 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -113,7 +113,7 @@ bool CStreamInstance::Stop() running = false; return (OpenThreads::Thread::join() == 0); } -#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(59, 27, 100) +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(61, 1, 100) bool CStreamInstance::Send(ssize_t r, const unsigned char *_buf) #else bool CStreamInstance::Send(ssize_t r, unsigned char * _buf) @@ -820,7 +820,7 @@ CStreamStream::~CStreamStream() Close(); } -#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(59, 27, 100) +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(61, 1, 100) int CStreamStream::write_packet(void *opaque, const uint8_t *buffer, int buf_size) #else int CStreamStream::write_packet(void *opaque, uint8_t *buffer, int buf_size) diff --git a/src/driver/streamts.h b/src/driver/streamts.h index 5d43d2b4b..b572dbbe1 100644 --- a/src/driver/streamts.h +++ b/src/driver/streamts.h @@ -54,7 +54,7 @@ class CStreamInstance : public OpenThreads::Thread t_channel_id channel_id; stream_pids_t pids; stream_fds_t fds; -#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(59, 27, 100) +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(61, 1, 100) virtual bool Send(ssize_t r, const unsigned char * _buf = NULL); #else virtual bool Send(ssize_t r, unsigned char * _buf = NULL); @@ -102,7 +102,7 @@ class CStreamStream : public CStreamInstance bool Stop(); static int Interrupt(void * data); -#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(59, 27, 100) +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(61, 1, 100) static int write_packet(void *opaque, const uint8_t *buffer, int buf_size); #else static int write_packet(void *opaque, uint8_t *buffer, int buf_size);