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 07:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'martiis-libstb-hal/master'

Browse Source 
Origin commit data
------------------
Branch: master
Commit: d542e543b6
Author: max_10 <max_10@gmx.de>
Date: 2014-07-21 (Mon, 21 Jul 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2014-07-21 21:27:06 +02:00
parent 90724f49e1 b2ece3ae20
commit a5e65e295d
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
generic-pc/playback.h
View File

@@ -10,6 +10,7 @@ typedef enum {
PLAYMODE_FILE, PLAYMODE_FILE,
} playmode_t; } playmode_t;
struct AVFormatContext;
class cPlayback class cPlayback
{ {
private: private:
@@ -26,6 +27,7 @@ class cPlayback
bool SetSubtitlePid(int pid); bool SetSubtitlePid(int pid);
bool SetTeletextPid(int pid); bool SetTeletextPid(int pid);
int GetAPid(void) { return mAudioStream; } int GetAPid(void) { return mAudioStream; }
int GetVPid(void);
int GetSubtitlePid(void) { return mSubtitleStream; } int GetSubtitlePid(void) { return mSubtitleStream; }
int GetTeletextPid(void); int GetTeletextPid(void);
void SuspendSubtitle(bool); void SuspendSubtitle(bool);
@@ -49,6 +51,7 @@ class cPlayback
void GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values); void GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values);
// //
~cPlayback(); ~cPlayback();
AVFormatContext *GetAVFormatContext(){ return NULL; }
void ReleaseAVFormatContext() {}
}; };
#endif #endif

2
libeplayer3/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = subdir-objects
noinst_LTLIBRARIES = libeplayer3.la noinst_LTLIBRARIES = libeplayer3.la
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects

2
libeplayer3/writer/h264.cpp
View File

@@ -4,8 +4,6 @@
* Copyright (C) 2010 konfetti (based on code from libeplayer2) * Copyright (C) 2010 konfetti (based on code from libeplayer2)
* Copyright (C) 2014 martii (based on code from libeplayer3) * Copyright (C) 2014 martii (based on code from libeplayer3)
* *
* Copyright (C) 2014 martii
*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2

2
libeplayer3/writer/vc1.cpp
View File

@@ -4,8 +4,6 @@
* Copyright (C) 2010 konfetti (based on code from libeplayer2) * Copyright (C) 2010 konfetti (based on code from libeplayer2)
* Copyright (C) 2014 martii (based on code from libeplayer3) * Copyright (C) 2014 martii (based on code from libeplayer3)
* *
* Copyright (C) 2014 martii
*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2

2
libeplayer3/writer/wmv.cpp
View File

@@ -4,8 +4,6 @@
* Copyright (C) 2010 konfetti (based on code from libeplayer2) * Copyright (C) 2010 konfetti (based on code from libeplayer2)
* Copyright (C) 2014 martii (based on code from libeplayer3) * Copyright (C) 2014 martii (based on code from libeplayer3)
* *
* Copyright (C) 2014 martii
*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2