summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv_timeline.c
Commit message (Collapse)AuthorAgeFilesLines
* demux_mkv_timeline: fix potential issue when enabling cachewm42015-02-261-0/+1
| | | | | | | | | | | | | | If the cache is enabled, the demuxer is closed and opened again (because currently, the cache can not be enabled atfer data was already read). The call for opening a new demuxer uses the same params struct, which references the ctx->uids array. But there is a MP_TARRAY_GROW() invocation somewhere on the way, which can reallocate the ctx->uids array, making params.uids a dangling pointer. This issue probably existed for a longer time, probably since 5cd33853 (slightly more obvious since f50b105d). (cherry picked from commit 9349cfca910990d1126b973fd2ca55cb2351d35f)
* demux_mkv_timeline: move uids array to context toowm42015-02-261-31/+26
| | | | | | | | | Again removes some indirections and extra arguments. Also replace some memcpy/memmoves with assignments. (Assignments became possible only later, when reference UIDs were turned into a struct.) (cherry picked from commit 02bd54c0ac0933bc2fe982666bbe4da75957c485)
* demux_mkv_timeline: pass sources array as part of contextwm42015-02-261-45/+39
| | | | | | Removes tripple pointer indirections and such. (cherry picked from commit 2bf0a5f2bcb5f0eea72f35d85e59125ad89566bf)
* 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)