summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv_timeline.c
Commit message (Collapse)AuthorAgeFilesLines
* demux, matroska: remove demuxer type fieldwm42015-02-191-29/+29
| | | | | | | | | | | | | | | The Matroska timeline code was the only thing which still used the demuxer.type field. This field explicitly identifies a demuxer implementation. The purpose of the Matroska timeline code was to reject files that are not Matroska. But it already forces the Matroska format, meaning loading will explicitly only use the Matroska demuxer. If the demuxer can't open the file, no other demuxer will be tried, and thus checking the field is redundant. The change in demux_mkv_timeline.c removes the if condition, and unindents the if body. (cherry picked from commit fa9b587426d7bd350d92afdb440c396336b2ecfd)
* matroska: move timeline code to demux/wm42015-02-191-0/+654
Separate from previous commit, because git is bad at tracking file renames when the file contents are also changed. (cherry picked from commit edc0007e74ab4ad043f35eed8cdebd9ed73c8062)