From d8a179dc856f6c2815bc0d725f434c84caafdb2c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 22 Dec 2024 16:37:37 +0100 Subject: [PATCH] streamts.cpp: Try to fix LIBAVFORMAT_VERSION_INT comparsion Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f7ad6b5f4df9c4ed763356495c3c010b4191ea16 Author: Thilo Graf Date: 2024-12-22 (Sun, 22 Dec 2024) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/streamts.cpp | 4 ++-- src/driver/streamts.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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);