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

Origin commit data
------------------
Branch: master
Commit: ad87948717
Author: max_10 <max_10@gmx.de>
Date: 2014-05-29 (Thu, 29 May 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-05-29 23:30:15 +02:00
6 changed files with 38 additions and 4 deletions

View File

@@ -10,9 +10,12 @@ typedef enum {
} playmode_t;
class Player;
struct AVFormatContext;
class cPlayback
{
friend class CStreamInfo2;
private:
bool enabled;
bool playing;
@@ -58,6 +61,9 @@ class cPlayback
void SetTitle(int title);
void GetChapters(std::vector<int> &positions, std::vector<std::string> &titles);
void GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values);
AVFormatContext *GetAVFormatContext();
void ReleaseAVFormatContext();
#if 0
// Functions that are not used by movieplayer.cpp:
bool GetOffset(off64_t &offset);