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

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

generic-pc/playback.h

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

libeplayer3/Makefile.am

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

libeplayer3/writer/h264.cpp

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

libeplayer3/writer/vc1.cpp

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

libeplayer3/writer/wmv.cpp

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