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

libeplayer3: try to fix dynamic linking

Browse Source 
Conflicts:
	libeplayer3/Makefile.am
	libspark/Makefile.am

Conflicts:
	libeplayer3/Makefile.am


Origin commit data
------------------
Branch: master
Commit: 030f06cee2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-13 (Fri, 13 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-13 19:55:54 +01:00
committed by max_10
parent 3bdf08d44f
commit 33cecf9897
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libduckbox/Makefile.am
View File

@@ -8,11 +8,12 @@ AM_CPPFLAGS += \
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
AM_LDFLAGS = -lpthread -lasound -lass -lrt \
AM_LDFLAGS = \
@AVFORMAT_LIBS@ \
@AVUTIL_LIBS@ \
@AVCODEC_LIBS@ \
@SWRESAMPLE_LIBS@
@SWRESAMPLE_LIBS@ \
-lpthread -lasound -lass -lrt
libduckbox_la_SOURCES = \
hardware_caps.c \

15
libeplayer3/Makefile.am
View File

@@ -9,10 +9,15 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
libeplayer3_la_SOURCES = \
input.cpp output.cpp manager.cpp player.cpp \
writer/writer.cpp writer/wmv.cpp writer/ac3.cpp writer/divx.cpp writer/pes.cpp \
writer/dts.cpp writer/mpeg2.cpp writer/mp3.cpp writer/misc.cpp writer/h264.cpp \
writer/h263.cpp writer/vc1.cpp writer/pcm.cpp
# writer/aac.cpp
writer/writer.cpp \
writer/pes.cpp \
writer/misc.cpp
LIBEPLAYER3_LIBS = libeplayer3.la -lpthread -lavformat -lavcodec -lavutil -lswresample -lm
# writer/wmv.cpp writer/ac3.cpp writer/divx.cpp
# writer/dts.cpp writer/mpeg2.cpp writer/mp3.cpp
# writer/h264.cpp
# writer/h263.cpp writer/vc1.cpp writer/pcm.cpp writer/aac.cpp
LIBEPLAYER3_LIBS = libeplayer3.la
# -lpthread -lavformat -lavcodec -lavutil -lswresample -lm

8
libspark/Makefile.am
View File

@@ -8,11 +8,13 @@ AM_CPPFLAGS += \
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
AM_LDFLAGS = -lpthread -lasound -lass -lrt \
AM_LDFLAGS = \
-lOpenThreads \
@AVFORMAT_LIBS@ \
@AVUTIL_LIBS@ \
@AVCODEC_LIBS@ \
@SWRESAMPLE_LIBS@
@SWRESAMPLE_LIBS@ \
-lpthread -lasound -lass -lrt
libspark_la_SOURCES = \
hardware_caps.c \
@@ -24,5 +26,3 @@ libspark_la_SOURCES = \
playback_libeplayer3.cpp \
pwrmngr.cpp \
record.cpp
#AM_CPPFLAGS += -DF_INTERRUPTS=20000 -DIRMP_EMBED -DLIRC_IRMP

4
libspark/playback_libeplayer3.cpp
View File

@@ -244,10 +244,10 @@ bool cPlayback::GetPosition(int &position, int &duration)
if (!player->isPlaying) {
lt_info("%s !!!!EOF!!!! < -1\n", __func__);
position = duration;
position = duration + 1000;
// duration = 0;
// this is stupid
return true;
return false;
}
int64_t vpts = 0;