diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 22:52:34 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 22:52:34 +0300 |
| commit | cb39fe9336539f7a88c5ac8e2ad6c840338c0306 (patch) | |
| tree | aeb1d8ccebca623a8ddfa80ea6f54e430c561a5a /libavcodec/libopenjpegenc.c | |
| parent | 82fe4072ea4251d47167017b3223928279a5abab (diff) | |
| parent | 91eee2af87278b3c2008f7a86d2cdfe6934e9f42 (diff) | |
Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42'
* commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42':
Revert "mov: Change DTS-based seek into CTS-based seek."
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopenjpegenc.c')
0 files changed, 0 insertions, 0 deletions