mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -25,6 +25,12 @@ extern "C" {
|
||||
#include <driver/framebuffer.h>
|
||||
#include "Debug.hpp"
|
||||
|
||||
#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(57, 1, 99)
|
||||
#define CODEC_DVB_SUB CODEC_ID_DVB_SUBTITLE
|
||||
#else
|
||||
#define CODEC_DVB_SUB AV_CODEC_ID_DVB_SUBTITLE
|
||||
#endif
|
||||
|
||||
// Set these to 'true' for debug output:
|
||||
static bool DebugConverter = false;
|
||||
|
||||
@@ -204,7 +210,7 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
|
||||
avcodec = NULL;
|
||||
|
||||
avcodec_register_all();
|
||||
avcodec = avcodec_find_decoder(CODEC_ID_DVB_SUBTITLE);
|
||||
avcodec = avcodec_find_decoder(CODEC_DVB_SUB);//CODEC_ID_DVB_SUBTITLE or AV_CODEC_ID_DVB_SUBTITLE from 57.1.100
|
||||
if (!avcodec) {
|
||||
dbgconverter("cDvbSubtitleConverter: unable to get dvb subtitle codec!\n");
|
||||
return;
|
||||
|
Reference in New Issue
Block a user