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-27 15:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/max_10/libstb-hal-max

Browse Source 
Origin commit data
------------------
Branch: master
Commit: dddd094e2b
Author: TangoCash <eric@loxat.de>
Date: 2018-10-02 (Tue, 02 Oct 2018)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2018-10-02 10:05:27 +02:00
parent 407321ca69 9e45bb2eb6
commit c97bcd982f
56 changed files with 1192 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libeplayer3/input.cpp
View File

@@ -290,17 +290,17 @@ static int lock_callback(void **mutex, enum AVLockOp op)
{
switch (op) {
case AV_LOCK_CREATE:
*mutex = (void *) new Mutex;
*mutex = (void *) new OpenThreads::Mutex;
return !*mutex;
case AV_LOCK_DESTROY:
delete static_cast<Mutex *>(*mutex);
delete static_cast<OpenThreads::Mutex *>(*mutex);
*mutex = NULL;
return 0;
case AV_LOCK_OBTAIN:
static_cast<Mutex *>(*mutex)->lock();
static_cast<OpenThreads::Mutex *>(*mutex)->lock();
return 0;
case AV_LOCK_RELEASE:
static_cast<Mutex *>(*mutex)->unlock();
static_cast<OpenThreads::Mutex *>(*mutex)->unlock();
return 0;
default:
return -1;
@@ -656,7 +656,7 @@ bool Input::Stop()
av_log(NULL, AV_LOG_QUIET, "%s", "");
if (avfc) {
ScopedLock lock(mutex);
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
for (unsigned int i = 0; i < avfc->nb_streams; i++)
avcodec_close(avfc->streams[i]->codec);
avformat_close_input(&avfc);