From d1b3eeaa3936834255b7167c4bfd15b77ef0868f Mon Sep 17 00:00:00 2001 From: martii Date: Wed, 16 Jul 2014 21:47:34 +0200 Subject: [PATCH 1/3] libeplayer3/writer: minor cleanup, no binary change Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/95b67078d13fec5381ae66e2e48e2e2d341fa41d Author: martii Date: 2014-07-16 (Wed, 16 Jul 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/writer/h264.cpp | 2 -- libeplayer3/writer/vc1.cpp | 2 -- libeplayer3/writer/wmv.cpp | 2 -- 3 files changed, 6 deletions(-) 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 From 0a5eeedb3cbbf7d25ed61d2cf18f15dc66cd19b1 Mon Sep 17 00:00:00 2001 From: martii Date: Sat, 19 Jul 2014 16:54:12 +0200 Subject: [PATCH 2/3] libeplayer3/Makefile.am: set AUTOMAKE_OPTIONS = subdir-objects Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/67d34a37a7e2e65e4662d69bda4c484bd5551b58 Author: martii Date: 2014-07-19 (Sat, 19 Jul 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am index 0ba2609..d63d835 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + noinst_LTLIBRARIES = libeplayer3.la AM_CPPFLAGS = -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS From b2ece3ae207ac2d4376d7cd20d7a3c735bd60da3 Mon Sep 17 00:00:00 2001 From: martii Date: Mon, 21 Jul 2014 19:35:55 +0200 Subject: [PATCH 3/3] fix generic compile Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d1908cec2a060dab99eb6bfb0b79e628606fd02c Author: martii 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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