mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

streamts.cpp: Try to fix LIBAVFORMAT_VERSION_INT comparsion

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7ad6b5f4d
Author: Thilo Graf <dbt@novatux.de>
Date: 2024-12-22 (Sun, 22 Dec 2024)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2024-12-22 16:37:37 +01:00
committed by vanhofen
parent abb840b48c
commit d8a179dc85
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/streamts.cpp
View File

@@ -113,7 +113,7 @@ bool CStreamInstance::Stop()
running = false; running = false;
return (OpenThreads::Thread::join() == 0); 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) bool CStreamInstance::Send(ssize_t r, const unsigned char *_buf)
#else #else
bool CStreamInstance::Send(ssize_t r, unsigned char * _buf) bool CStreamInstance::Send(ssize_t r, unsigned char * _buf)
@@ -820,7 +820,7 @@ CStreamStream::~CStreamStream()
Close(); 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) int CStreamStream::write_packet(void *opaque, const uint8_t *buffer, int buf_size)
#else #else
int CStreamStream::write_packet(void *opaque, uint8_t *buffer, int buf_size) int CStreamStream::write_packet(void *opaque, uint8_t *buffer, int buf_size)

4
src/driver/streamts.h
View File

@@ -54,7 +54,7 @@ class CStreamInstance : public OpenThreads::Thread
t_channel_id channel_id; t_channel_id channel_id;
stream_pids_t pids; stream_pids_t pids;
stream_fds_t fds; 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); virtual bool Send(ssize_t r, const unsigned char * _buf = NULL);
#else #else
virtual bool Send(ssize_t r, unsigned char * _buf = NULL); virtual bool Send(ssize_t r, unsigned char * _buf = NULL);
@@ -102,7 +102,7 @@ class CStreamStream : public CStreamInstance
bool Stop(); bool Stop();
static int Interrupt(void * data); 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); static int write_packet(void *opaque, const uint8_t *buffer, int buf_size);
#else #else
static int write_packet(void *opaque, uint8_t *buffer, int buf_size); static int write_packet(void *opaque, uint8_t *buffer, int buf_size);