diff --git a/generic-pc/playback.h b/generic-pc/playback.h index aad792a..bfe9f9c 100644 --- a/generic-pc/playback.h +++ b/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 &keys, std::vector &values); // ~cPlayback(); + AVFormatContext *GetAVFormatContext(){ return NULL; } + void ReleaseAVFormatContext() {} }; - #endif diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am index a0da644..e261e68 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + noinst_LTLIBRARIES = libeplayer3.la AUTOMAKE_OPTIONS = subdir-objects diff --git a/libeplayer3/writer/h264.cpp b/libeplayer3/writer/h264.cpp index ebf1825..639a083 100644 --- a/libeplayer3/writer/h264.cpp +++ b/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 diff --git a/libeplayer3/writer/vc1.cpp b/libeplayer3/writer/vc1.cpp index b0fd743..94d845d 100644 --- a/libeplayer3/writer/vc1.cpp +++ b/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 diff --git a/libeplayer3/writer/wmv.cpp b/libeplayer3/writer/wmv.cpp index 22dea64..c20a0d6 100644 --- a/libeplayer3/writer/wmv.cpp +++ b/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