mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
This commit is contained in:
@@ -293,7 +293,6 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state,
|
||||
seek_flags = 0;
|
||||
}
|
||||
av_seek_frame(avc, best_stream, pts, seek_flags);
|
||||
skip = 0;
|
||||
// if a custom value was set we only jump once
|
||||
if (actSecsToSkip != 0) {
|
||||
*state=PLAY;
|
||||
|
Reference in New Issue
Block a user