mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: cf951434d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-20 (Tue, 20 Jun 2017)
This commit is contained in:
Jacek Jendrzej
2017-06-20 14:26:38 +02:00
parent 7cf343f927 0f3b5e5eaf
commit d803f09645
14 changed files with 270 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/streamts.cpp
View File

@@ -852,7 +852,7 @@ bool CStreamStream::Open()
av_dict_copy(&ofcx->metadata, ifcx->metadata, 0);
int stid = 0x200;
for (unsigned i = 0; i < ifcx->nb_streams; i++) {
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ))
AVCodecContext * iccx = ifcx->streams[i]->codec;
AVStream *ost = avformat_new_stream(ofcx, iccx->codec);
avcodec_copy_context(ost->codec, iccx);
@@ -925,7 +925,7 @@ void CStreamStream::run()
if (pkt.stream_index < 0)
continue;
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,5,0 ))
#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ))
AVCodecContext *codec = ifcx->streams[pkt.stream_index]->codec;
#else
AVCodecParameters *codec = ifcx->streams[pkt.stream_index]->codecpar;