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

unnecessary brackets removed

Browse Source 
- distinction ffmpeg versions


Origin commit data
------------------
Branch: master
Commit: 4e086f9883
Author: Frankenstone <dampf_acc@online.de>
Date: 2021-05-17 (Mon, 17 May 2021)



------------------
This commit was generated by Migit
This commit is contained in:
Frankenstone
2021-05-17 21:07:45 +02:00
committed by vanhofen
parent ad2cd91a07
commit 2af4fc68a3
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libeplayer3-sh4/input.cpp
View File

@@ -54,7 +54,7 @@ Input::Input()
seek_avts_abs = INT64_MIN;
seek_avts_rel = 0;
abortPlayback = false;
#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT( 57,25,100 ))
#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(57,25,100)
for (int n = 0;n < EPLAYER_MAX_CODECS;n++)
codecs[n].codec = NULL;
#endif
@@ -114,7 +114,7 @@ static void logprintf(const char *format, ...)
AVCodecContext *Input::GetCodecContext(unsigned int index)
{
#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT( 57,25,100 ))
#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(57,25,100)
if (codecs[index].codec) {
return codecs[index].codec;
}
@@ -376,7 +376,7 @@ bool Input::ReadSubtitle(const char *filename, const char *format, int pid)
AVCodecContext *c = NULL;
AVCodec *codec = NULL;
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ))
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57,25,101)
c = subavfc->streams[0]->codec;
#else
c = avcodec_alloc_context3(codec);
@@ -412,7 +412,7 @@ bool Input::ReadSubtitle(const char *filename, const char *format, int pid)
av_packet_unref(&packet);
}
avcodec_close(c);
#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT( 57,25,100 ))
#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(57,25,100)
avcodec_free_context(&c);
#endif
avformat_close_input(&subavfc);
@@ -509,8 +509,8 @@ again:
avfc->iformat->flags |= AVFMT_SEEK_TO_PTS;
avfc->flags = AVFMT_FLAG_GENPTS;
if (player->noprobe) {
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55, 43, 100)) || \
(LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(57, 25, 0))
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55, 43, 100) || \
LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(57, 25, 0)
avfc->max_analyze_duration = 1;
#else
avfc->max_analyze_duration2 = 1;
@@ -715,7 +715,7 @@ bool Input::Stop()
if (avfc) {
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
for (unsigned int i = 0; i < avfc->nb_streams; i++) {
#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT( 57,25,100 ))
#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(57,25,100)
if (codecs[i].codec)
avcodec_free_context(&codecs[i].codec);
#else