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-29 08:20:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mpx' of https://github.com/tuxbox-neutrino/library-stb-hal

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 2c7723a78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-24 (Fri, 24 Nov 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-24 10:55:14 +01:00
parent faca83a4e7 d86a07a4c2
commit 80d7563734
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = libstb-hal.la
libstb_hal_la_SOURCES =
SUBDIRS = common tools libthread
bin_PROGRAMS = libstb-hal-test
#bin_PROGRAMS = libstb-hal-test
libstb_hal_la_LIBADD = \
common/libcommon.la \

9
libarmbox/playback_gst.cpp
View File

@@ -77,7 +77,7 @@ pthread_mutex_t mutex_tag_ist;
static int end_eof = 0;
#define HTTP_TIMEOUT 30
// taken from record.h
#define REC_MAX_APIDS 20
#define REC_MAX_APIDS 10
int real_apids[REC_MAX_APIDS];
gint match_sinktype(const GValue *velement, const gchar *type)
@@ -906,6 +906,9 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
{
lt_info( "%s:%s\n", FILENAME, __FUNCTION__);
language->clear();
*numpida = 0;
if(m_gst_playbin)
{
gint i, n_audio = 0;
@@ -917,9 +920,7 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
if(n_audio == 0)
return;
language->clear();
for (i = 0; i < n_audio && i < *numpida; i++)
for (i = 0; i < n_audio && i < REC_MAX_APIDS; i++)
{
// apids
apids[i]= real_apids[i] ? real_apids[i] : i;