mpv/core/timeline
wm4 e18ffd6b99 Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.

Conflicts:
	stream/stream.c
2013-07-14 17:59:26 +02:00
..
tl_cue.c core: change open_stream and demux_open signature 2013-07-12 21:56:40 +02:00
tl_edl.c core: change open_stream and demux_open signature 2013-07-12 21:56:40 +02:00
tl_matroska.c Merge branch 'remove_old_demuxers' 2013-07-14 17:59:26 +02:00