mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
This commit is contained in:
vanhofen
2017-04-19 23:24:19 +02:00
parent 810758370c fb4c0f65a6
commit 31724507a8
25 changed files with 192 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.cpp
View File

@@ -2024,7 +2024,7 @@ void CStreamRec::FillMovieInfo(CZapitChannel * /*channel*/, APIDList & /*apid_li
for (unsigned i = 0; i < ofcx->nb_streams; i++) {
AVStream *st = ofcx->streams[i];
#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
AVCodecContext * codec = st->codec;
#else
AVCodecParameters * codec = st->codecpar;
@@ -2257,7 +2257,7 @@ bool CStreamRec::Open(CZapitChannel * channel)
stream_index = -1;
int stid = 0x200;
for (unsigned i = 0; i < ifcx->nb_streams; i++) {
#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
AVCodecContext * iccx = ifcx->streams[i]->codec;
AVStream *ost = avformat_new_stream(ofcx, iccx->codec);
avcodec_copy_context(ost->codec, iccx);
@@ -2313,7 +2313,7 @@ void CStreamRec::run()
break;
if (pkt.stream_index < 0)
continue;
#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
AVCodecContext *codec = ifcx->streams[pkt.stream_index]->codec;
#else
AVCodecParameters *codec = ifcx->streams[pkt.stream_index]->codecpar;