diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-03 01:38:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-03 01:38:58 +0100 |
| commit | 0506f687e8771c2bc3cddf4c9bc3ad77e37f69f2 (patch) | |
| tree | 9095cbd6fbdd8a0f5b7264bd85ed7276a20b95e8 /libavformat/dashenc.c | |
| parent | 68a06a244c06cd7caa6ed724c7cfbd2dbd7725b8 (diff) | |
| parent | c725faebda9a516766d94c33b07972ab0f70cf93 (diff) | |
Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'
* commit 'c725faebda9a516766d94c33b07972ab0f70cf93':
movenc: Use start_dts/cts instead of cluster[0] for writing edit lists
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/dashenc.c')
0 files changed, 0 insertions, 0 deletions