sync with seife

Origin commit data
------------------
Branch: master
Commit: 848730507b
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-10-06 10:16:33 +02:00
11 changed files with 115 additions and 89 deletions

View File

@@ -65,7 +65,7 @@ static const AVRational aspect_ratios[6] = {
{ -1,-1 }
};
cVideo::cVideo(int, void *, void *)
cVideo::cVideo(int, void *, void *, unsigned int)
{
lt_debug("%s\n", __func__);
av_register_all();
@@ -660,3 +660,8 @@ int64_t cVideo::GetPTS(void)
buf_m.unlock();
return pts;
}
void cVideo::SetDemux(cDemux *)
{
lt_debug("%s: not implemented yet\n", __func__);
}