Commit Graph

6 Commits

Author SHA1 Message Date
Alexandro Sánchez Bach
01dbb8eb9a Merge pull request #145 from Nekotekina/master
Fixed conflicts.
2014-03-31 12:04:34 +02:00
Nekotekina
169fcd098b Demuxer improvement 2014-03-22 05:08:25 +04:00
Nekotekina
05c6a96d27 Conflicts fixed 2014-03-06 15:50:45 +04:00
Nekotekina
c064c701e2 cellAdec draft 2014-03-03 03:02:42 +04:00
Nekotekina
0bd5dc5363 Demuxer improved, cellPamf improved
File reading improved
2014-02-26 11:51:00 +04:00
Nekotekina
a14276abf1 Work on demuxer, ffmpeg libs linked 2014-02-24 04:00:42 +04:00